added better LVM handling

3 files changed, 18 insertions, 13 deletions

diff --git a/rc.conf b/rc.conf
index a8fc8e8..948ddbf 100644
--- a/rc.conf
+++ b/rc.conf
@@ -17,6 +17,9 @@ KEYMAP=us
 CONSOLEFONT=
 USECOLOR="yes"
 
+# Scan for LVM volume groups at startup, required if you use LVM
+USELVM="no"
+
 #
 # Networking
 #
diff --git a/rc.shutdown b/rc.shutdown
index 655dc14..d266ddc 100755
--- a/rc.shutdown
+++ b/rc.shutdown
@@ -85,7 +85,7 @@ if [ "$RUNLEVEL" = "0" ]; then
 	/sbin/poweroff -d -f -h -i
 else
 	printsep
-	printhl "${C_H2}REBOOTING.."
+	printhl "${C_H2}REBOOTING"
 	/sbin/reboot -d -f -i
 fi
 
diff --git a/rc.sysinit b/rc.sysinit
index 802b4d8..d437aa8 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -23,18 +23,20 @@ if [ -e /dev/.devfsd -a -x /sbin/devfsd ]; then
 	status "Starting DevFS Daemon" /sbin/devfsd /dev
 fi
 
-if [ -f /etc/lvmtab -a -x /sbin/vgchange ]; then
-	/bin/mount -n -t proc none /proc
-	stat_busy "Activating LVM1 groups"
-	/sbin/vgchange -a y
-	stat_done
-	umount /proc
-elif [ -d /etc/lvm -a -x /sbin/lvm ]; then
-	/bin/mount -n -t proc none /proc
-	stat_busy "Activating LVM2 groups"
-	/sbin/lvm vgchange --ignorelockingfailure -a y
-	stat_done
-	umount /proc
+if [ "$USELVM" = "yes" -o "$USELVM" = "YES" ]; then
+	if [ -f /etc/lvmtab -a -x /sbin/vgchange ]; then
+		/bin/mount -n -t proc none /proc
+		stat_busy "Activating LVM1 groups"
+		/sbin/vgchange -a y
+		stat_done
+		umount /proc
+	elif [ -x /sbin/lvm ]; then
+		/bin/mount -n -t proc none /proc
+		stat_busy "Activating LVM2 groups"
+		/sbin/lvm vgchange --ignorelockingfailure -a y
+		stat_done
+		umount /proc
+	fi
 fi
 
 status "Activating Swap" /sbin/swapon -a