rc.sysinit: check vars first, allow disable multipath from kernel cmdline

svn-id: @12671

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index c09ef9cc08b1c0e299e1e2b1e8e6035d784195f2..5da3146df3b039c8454f718e2f670476d916ee95 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -64,6 +64,10 @@ parse_cmdline() {
                        # default is set in /etc/sysconfig/system
                        START_UDEV=no
                ;;
+               nomultipath)
+                       # default is set in /etc/sysconfig/system
+                       DM_MULTIPATH=no
+               ;;
                nousb)
                        nousb=1
                ;;
@@ -619,7 +623,7 @@ if ! is_yes "$VSERVER"; then
                done
        fi
 
-       if [ -x /sbin/multipath ] && ! is_no "$DM_MULTIPATH"; then
+       if ! is_no "$DM_MULTIPATH" [ -x /sbin/multipath ]; then
                # first make nodes that were discarded due (possible) new /dev mount
                modprobe -s dm-mod
                /sbin/dmsetup mknodes