add $LVM2

allows you to disable LVM2 if your only LVM volume is rootfs started on initrd and want faster startup

svn-id: @12339

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 380fb05cea1bf47a705de2a9c7674bb2078fec56..70bc919a19871fd9ac89d0f927daf0d568ae10d3 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -590,8 +590,12 @@ if ! is_yes "$VSERVER"; then
        fi
 
        # LVM (keep in sync with LVM starting after RAID run!)
-       if is_yes "$EVMS_LVM" || [ -x /sbin/vgscan -a -x /sbin/vgchange ]; then
-               lvmversion=$(LC_ALL=C /sbin/vgchange --version 2>/dev/null | awk '/LVM version:/{if ($3 >= 2) print "2"}')
+       if is_yes "$LVM2" && [ -x /sbin/vgscan -a -x /sbin/vgchange ] || is_yes "$EVMS_LVM"; then
+               if is_yes "$LVM2"; then
+                       lvmversion=2
+               else
+                       lvmversion=$(LC_ALL=C /sbin/vgchange --version 2>/dev/null | awk '/LVM version:/{if ($3 >= 2) print "2"}')
+               fi
                if [ "$lvmversion" = "1" ] ; then
                        modprobe -s lvm-mod >/dev/null 2>&1
                        lvmignorelock=""

diff --git a/sysconfig/system b/sysconfig/system
index 8a4fd16361f81258255fcd4c1da787263d0e1cc4..b8185fa747481d3a4481da974f30158113cf5303 100644 (file)
--- a/sysconfig/system
+++ b/sysconfig/system
@@ -88,6 +88,10 @@ EVMS_AIX=no
 # EVMS OS/2 LVM volumes
 EVMS_OS2=no
 
+# LVM2
+# disable if your only LVM volume is rootfs started on initrd and want faster startup
+LVM2=yes
+
 # Set to anything other than 'no' to allow hotkey interactive startup...
 RC_PROMPT=yes