[readonly/geninitrd: 526/1068] - MULTIPATH_ID -> MULTIPATH_WWID

[draenog]

commit e136dd8b8c5c4ff3543f9908c1f7075c0bf22e2f
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Tue Nov 13 22:01:40 2007 +0000

    - MULTIPATH_ID -> MULTIPATH_WWID
    
    svn-id: @9044

 geninitrd | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/geninitrd b/geninitrd
index d7c5edd..650ba56 100755
--- a/geninitrd
+++ b/geninitrd
@@ -76,8 +76,8 @@ have_md=no
 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 @@ find_modules_multipath() {
 	# 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_multipath() {
 	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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/readonly/geninitrd.git/commitdiff/147754ca159d40ca5eb541074dc043d8cbd92090