vgscan/vgmknodes/vgdisplay don't support --sysinit option. Back to ignorelocking...

svn-id: @12455

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 054cfbd827c05e9d1427514c316236544fce06ec..d866c5ab295bc0129b60a64b623566aa5b9db3fe 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -617,23 +617,26 @@ if ! is_yes "$VSERVER"; then
                fi
                if [ "$lvmversion" = "1" ] ; then
                        modprobe -s lvm-mod >/dev/null 2>&1
+                       lvmignorelocking=""
                        lvmsysinit=""
                elif [ "$lvmversion" = "2" ] ; then
                        modprobe -s dm-mod >/dev/null 2>&1
+                       lvmignorelocking="--ignorelockingfailure"
                        lvmsysinit="--sysinit"
                else
                        modprobe -s lvm-mod >/dev/null 2>&1
                        # device mapper (2.5+ and patched 2.4)
                        modprobe -s dm-mod >/dev/null 2>&1
+                       lvmignorelocking=""
                        lvmsysinit=""
                fi
 
-               run_cmd "Scanning for LVM volume groups" /sbin/vgscan $lvmsysinit
+               run_cmd "Scanning for LVM volume groups" /sbin/vgscan $lvmignorelocking
                run_cmd "Activating LVM volume groups" /sbin/vgchange -a y $lvmsysinit
                if [ "$lvmversion" = "2" ]; then
-                       /sbin/vgmknodes $lvmsysinit
+                       /sbin/vgmknodes $lvmignorelocking
                        # display VG statistics
-                       /sbin/vgdisplay -s $lvmsysinit
+                       /sbin/vgdisplay -s $lvmignorelocking
                fi
        fi
 
@@ -732,7 +735,7 @@ if ! is_yes "$VSERVER"; then
                        # LVM on RAID (keep in sync with LVM setting few lines above)
                        if [ "$golvm" -eq "1" ]; then
                                if [ -x /sbin/vgscan -a -x /sbin/vgchange ]; then
-                                       run_cmd "Scanning for LVM volume groups (on RAID)" /sbin/vgscan $lvmsysinit
+                                       run_cmd "Scanning for LVM volume groups (on RAID)" /sbin/vgscan $lvmignorelocking
                                        run_cmd "Activating LVM volume groups (on RAID)" /sbin/vgchange -a y $lvmsysinit
                                        [ "$lvmversion" = "2" ] && /sbin/vgmknodes
                                fi