[arch-projects] [PATCH] [initscripts] Change stat_busy()/stat_done() -> status()

Gerardo Exequiel Pozzi vmlinuz386 at yahoo.com.ar
Sat Apr 30 15:52:40 EDT 2011


Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
---
 rc.shutdown |   17 +++++------------
 rc.single   |    5 +----
 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
 
diff --git a/rc.single b/rc.single
index 06bd83c..d1191d2 100755
--- a/rc.single
+++ b/rc.single
@@ -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
diff --git a/rc.sysinit b/rc.sysinit
index dc4be58..e07afe6 100755
--- a/rc.sysinit
+++ b/rc.sysinit
@@ -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
-- 
1.7.5



More information about the arch-projects mailing list