diff options
| author | Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> | 2011-04-30 16:52:40 -0300 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2011-05-08 01:41:09 +0200 |
| commit | d8796827633d533e53ba7e158ee6354c38d0e88e (patch) | |
| tree | 4eefd1ebc7d4bb43167e7caa0b3844116d0bd4b4 | |
| parent | e98a352e9568ec31b33af8671987d026f1f73647 (diff) | |
| download | initscripts-d8796827633d533e53ba7e158ee6354c38d0e88e.tar.xz | |
Change stat_busy()/stat_done() -> status()
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Signed-off-by: Tom Gundersen <teg@jklm.no>
| -rwxr-xr-x | rc.shutdown | 17 | ||||
| -rwxr-xr-x | rc.single | 5 | ||||
| -rwxr-xr-x | rc.sysinit | 3 |
3 files changed, 7 insertions, 18 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 @@ -10,10 +10,7 @@ run_hook single_start if [[ $PREVLEVEL != N ]]; then kill_everything single - stat_busy "Starting UDev Daemon" - /sbin/udevd --daemon - stat_done - + status "Starting UDev Daemon" /sbin/udevd --daemon run_hook single_udevlaunched # Trigger udev uevents @@ -275,8 +275,7 @@ if [[ -x /sbin/fsck ]]; then stat_done fi -stat_busy "Mounting Local Filesystems" -/bin/mount -n -o remount,rw / +status "Mounting Local Filesystems" /bin/mount -n -o remount,rw / # don't touch /etc/mtab if it is a symlink to /proc/self/mounts if [[ -L /etc/mtab ]]; then |