SVN: rc-scripts/trunk: rc.d/rc.sysinit sysconfig/system

[glen]

Author: glen
Date: Fri Sep  2 08:16:24 2011
New Revision: 12339

Modified:
   rc-scripts/trunk/rc.d/rc.sysinit
   rc-scripts/trunk/sysconfig/system
Log:
add $LVM2

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


Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit	(original)
+++ rc-scripts/trunk/rc.d/rc.sysinit	Fri Sep  2 08:16:24 2011
@@ -590,8 +590,12 @@
 	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=""

Modified: rc-scripts/trunk/sysconfig/system
==============================================================================
--- rc-scripts/trunk/sysconfig/system	(original)
+++ rc-scripts/trunk/sysconfig/system	Fri Sep  2 08:16:24 2011
@@ -88,6 +88,10 @@
 # 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