diff options
| author | Thomas Bächler <thomas@archlinux.org> | 2007-05-13 12:01:11 +0000 |
|---|---|---|
| committer | Thomas Bächler <thomas@archlinux.org> | 2007-05-13 12:01:11 +0000 |
| commit | aca95b25037ee1085c70a2e73b609a5d8cdff44b (patch) | |
| tree | 47774908c0ac691323786a75396c0b34b9eafa8b /rc.shutdown | |
| parent | cc2c8b1fa2a709b405e3efc65222b984a63e13c6 (diff) | |
| download | initscripts-aca95b25037ee1085c70a2e73b609a5d8cdff44b.tar.xz | |
upgpkg: initscripts 0.8-10
Diffstat (limited to 'rc.shutdown')
| -rwxr-xr-x | rc.shutdown | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/rc.shutdown b/rc.shutdown index e242b97..a6f8145 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -77,7 +77,7 @@ stat_busy "Deactivating Swap" stat_done stat_busy "Unmounting Filesystems" -/bin/umount -a +/bin/umount -a -t noramfs,notmpfs,nosysfs,noproc stat_done # Kill non-root encrypted partition mappings @@ -102,14 +102,10 @@ if [ -f /etc/crypttab -a -n "$(grep -v ^# /etc/crypttab | grep -v ^$)" ]; then fi if [ "$USELVM" = "yes" -o "$USELVM" = "YES" ]; then - if [ -d /etc/lvm -a -x /sbin/lvm ]; then - /bin/mount -n -t sysfs none /sys 2>/dev/null - if [ -d /sys/block ]; then - stat_busy "Deactivating LVM2 groups" - /sbin/lvm vgchange --ignorelockingfailure -an >/dev/null 2>&1 - stat_done - umount /sys - fi + if [ -x /sbin/lvm -a -d /sys/block ]; then + stat_busy "Deactivating LVM2 groups" + /sbin/lvm vgchange --ignorelockingfailure -an >/dev/null 2>&1 + stat_done fi fi @@ -125,8 +121,8 @@ if [ "$RUNLEVEL" = "0" ]; then else printsep printhl "${C_H2}REBOOTING" - # adding kexec support - [ -x /usr/sbin/kexec ] && /usr/sbin/kexec -e > /dev/null 2>&1 + # if kexec is installed and a kernel is loaded, use it + [ -x /sbin/kexec ] && /sbin/kexec -e > /dev/null 2>&1 /sbin/reboot -d -f -i fi |