- MULTIPATH_ID -> MULTIPATH_WWID

svn-id: @9044

diff --git a/geninitrd b/geninitrd
index d7c5edd9da21d6e9bf8d117b7807bda1af75fbed..650ba565938893eb99690169f274ac09ee90839c 100755 (executable)
--- 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