diff options
| author | Judd Vinet <judd@archlinux.org> | 2004-02-29 23:09:37 +0000 |
|---|---|---|
| committer | Judd Vinet <judd@archlinux.org> | 2004-02-29 23:09:37 +0000 |
| commit | abbe7921517e87dcf3fa61036d26d72bc714257a (patch) | |
| tree | b8630b13b7bc3f15afa0d1fc8428431393aafad6 | |
| parent | 0d76f45bffddced00c83b0c06f1be796a780366b (diff) | |
| download | initscripts-0.6.tar.xz | |
added --ignorelockingfailure during startup vgchange (LVM2)0.6
| -rwxr-xr-x | rc.shutdown | 19 | ||||
| -rwxr-xr-x | rc.sysinit | 22 |
2 files changed, 18 insertions, 23 deletions
diff --git a/rc.shutdown b/rc.shutdown index 538eb96..630f09b 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -64,17 +64,14 @@ stat_busy "Unmounting Filesystems" /bin/umount -a stat_done -if [ -f /etc/lvmtab ]; then - if [ -x /sbin/lvm ]; then - stat_busy "Deactivating LVM2 groups" - /sbin/lvm vgchange --ignorelockingfailure -a n - stat_done - elif [ -x /sbin/vgchange ]; then - stat_busy "Deactivating LVM1 groups" - /sbin/vgchange -a n - stat_done - fi - umount /proc +if [ -f /etc/lvmtab -a -x /sbin/vgchange ]; then + stat_busy "Deactivating LVM1 groups" + /sbin/vgchange -a n + stat_done +elif [ -d /etc/lvm -a -x /sbin/lvm ]; then + stat_busy "Deactivating LVM2 groups" + /sbin/lvm vgchange --ignorelockingfailure -a n + stat_done fi stat_busy "Remounting Root Filesystem Read-only" @@ -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 |