SVN: geninitrd/trunk/geninitrd

[glen]

Author: glen
Date: Tue Nov 13 23:01:40 2007
New Revision: 9044

Modified:
   geninitrd/trunk/geninitrd
Log:
- MULTIPATH_ID -> MULTIPATH_WWID

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Tue Nov 13 23:01:40 2007
@@ -76,8 +76,8 @@
 have_dmraid=no
 # if we should init dm-multipath at boot
 have_multipath=no
-# dm-multipath id which is used for rootfs
-MULTIPATH_ID=
+# dm-multipath wwid which is used for rootfs
+MULTIPATH_WWID=
 
 usage() {
 	uname_r=$(uname -r)
@@ -692,9 +692,9 @@
 	# remove partition, if any
 	local disk=${devpath%p[0-9]*}
 	# need only dm name
-	MULTIPATH_ID=${disk#/dev/mapper/}
+	MULTIPATH_WWID=${disk#/dev/mapper/}
 
-	local info=$(multipath -l $MULTIPATH_ID)
+	local info=$(multipath -l $MULTIPATH_WWID)
 	if [ -z "$info" ]; then
 		return 1
 	fi
@@ -1042,7 +1042,7 @@
 	initrd_gen_devices
 
 	mount_sys
-	echo "export WWID=$MULTIPATH_ID" | add_linuxrc
+	echo "export WWID=$MULTIPATH_WWID" | add_linuxrc
 	add_linuxrc <<-'EOF'
 		# parse wwid= from kernel commandline
 		for arg in $CMDLINE; do