Use --sysinit for lvm. When stopping hide error messages (normal for many cases like...

svn-id: @12360

diff --git a/rc.d/rc.shutdown b/rc.d/rc.shutdown
index a7efc8b9a7a4c218b38d53efed4ca8b922d44504..e1d056cc08edb639123e0a234451ae9fc6b359d0 100755 (executable)
--- a/rc.d/rc.shutdown
+++ b/rc.d/rc.shutdown
@@ -116,11 +116,11 @@ if ! is_yes "$VSERVER"; then
        if [ -x /sbin/vgchange ]; then
                lvmversion=$(LC_ALL=C /sbin/vgchange --version 2>/dev/null | awk '/LVM version:/{if ($3 >= 2) print "2"}')
                if [ "$lvmversion" = "2" ]; then
-                       lvmignorelock="--ignorelockingfailure"
+                       lvmsysinit="--sysinit"
                else
-                       lvmignorelock=""
+                       lvmsysinit=""
                fi
-               run_cmd "Stopping LVM volume groups" /sbin/vgchange -a n $lvmignorelock
+               /sbin/vgchange -a n $lvmsysinit > /dev/null 2>&1
        fi
 
        goraidtab=1

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 76895623c344c0d9c121792a71a2f0c66a394b5e..25abb6edaeff853e1d2b50843a0eec3d15043eec 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -606,23 +606,23 @@ if ! is_yes "$VSERVER"; then
                fi
                if [ "$lvmversion" = "1" ] ; then
                        modprobe -s lvm-mod >/dev/null 2>&1
-                       lvmignorelock=""
+                       lvmsysinit=""
                elif [ "$lvmversion" = "2" ] ; then
                        modprobe -s dm-mod >/dev/null 2>&1
-                       lvmignorelock="--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
-                       lvmignorelock=""
+                       lvmsysinit=""
                fi
 
-               run_cmd "Scanning for LVM volume groups" /sbin/vgscan $lvmignorelock
-               run_cmd "Activating LVM volume groups" /sbin/vgchange -a y $lvmignorelock
+               run_cmd "Scanning for LVM volume groups" /sbin/vgscan $lvmsysinit
+               run_cmd "Activating LVM volume groups" /sbin/vgchange -a y $lvmsysinit
                if [ "$lvmversion" = "2" ]; then
-                       /sbin/vgmknodes $lvmignorelock
+                       /sbin/vgmknodes $lvmsysinit
                        # display VG statistics
-                       /sbin/vgdisplay -s $lvmignorelock
+                       /sbin/vgdisplay -s $lvmsysinit
                fi
        fi
 
@@ -721,8 +721,8 @@ 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 $lvmignorelock
-                                       run_cmd "Activating LVM volume groups (on RAID)" /sbin/vgchange -a y $lvmignorelock
+                                       run_cmd "Scanning for LVM volume groups (on RAID)" /sbin/vgscan $lvmsysinit
+                                       run_cmd "Activating LVM volume groups (on RAID)" /sbin/vgchange -a y $lvmsysinit
                                        [ "$lvmversion" = "2" ] && /sbin/vgmknodes
                                fi
                        fi