summaryrefslogtreecommitdiff
path: root/rc.sysinit
diff options
context:
space:
mode:
Diffstat (limited to 'rc.sysinit')
-rwxr-xr-xrc.sysinit22
1 files changed, 10 insertions, 12 deletions
diff --git a/rc.sysinit b/rc.sysinit
index c5b6bfb..802b4d8 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -23,19 +23,17 @@ if [ -e /dev/.devfsd -a -x /sbin/devfsd ]; then
status "Starting DevFS Daemon" /sbin/devfsd /dev
fi
-if [ -f /etc/lvmtab ]; then
- # /proc is temporarily mounted to check for LVM support - it is
- # re-mounted later from /etc/fstab
+if [ -f /etc/lvmtab -a -x /sbin/vgchange ]; then
/bin/mount -n -t proc none /proc
- if [ -x /sbin/lvm ]; then
- stat_busy "Activating LVM2 groups"
- /sbin/lvm vgscan
- /sbin/lvm vgchange -a y
- elif [ -f /proc/lvm/global -a -x /sbin/vgchange ]; then
- stat_busy "Activating LVM1 groups"
- /sbin/vgchange -a y
- stat_done
- fi
+ 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
fi