diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-05-18 11:16:19 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-05-18 11:16:19 -0300 |
| commit | 84a17ca62a9bcfcfaef320c38bb45add1f673afd (patch) | |
| tree | 9e7789b4c6fd7536b5b00ba7b64d7dc4db0ed878 /rc.shutdown | |
| parent | 0363775a534e231ae1b906079ddf980a08a8de67 (diff) | |
| parent | c6b3853de29e5bb42adda4a2f62a08d87ea15740 (diff) | |
Merge branch 'master' of https://projects.archlinux.org/git/initscripts into parabola2011.05.2parabola
Diffstat (limited to 'rc.shutdown')
| -rwxr-xr-x | rc.shutdown | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/rc.shutdown b/rc.shutdown index a78bc4d..604fdec 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -42,15 +42,12 @@ fi # Write to wtmp file before unmounting /sbin/halt -w -stat_busy "Deactivating Swap" -/sbin/swapoff -a -stat_done +status "Deactivating Swap" /sbin/swapoff -a # stop monitoring of lvm2 groups before unmounting filesystems if [[ $USELVM =~ yes|YES && -x /sbin/lvm && -d /sys/block ]]; then - stat_busy "Deactivating monitoring of LVM2 groups" - /sbin/vgchange --monitor n >/dev/null 2>&1 - stat_done + status "Deactivating monitoring of LVM2 groups" \ + /sbin/vgchange --monitor n >/dev/null 2>&1 fi stat_busy "Unmounting Filesystems" @@ -83,14 +80,10 @@ if [[ -f /etc/crypttab && -n $CS ]] && /bin/grep -q ^[^#] /etc/crypttab; then fi if [[ $USELVM =~ yes|YES && -x /sbin/lvm && -d /sys/block ]]; then - stat_busy "Deactivating LVM2 groups" - /sbin/vgchange --sysinit -a n >/dev/null 2>&1 - stat_done + status "Deactivating LVM2 groups" /sbin/vgchange --sysinit -a n >/dev/null 2>&1 fi -stat_busy "Remounting Root Filesystem Read-only" -/bin/mount -n -o remount,ro / -stat_done +status "Remounting Root Filesystem Read-only" /bin/mount -n -o remount,ro / run_hook shutdown_poweroff |