diff options
| -rwxr-xr-x | rc.d/init.d/halt | 18 | ||||
| -rwxr-xr-x | rc.d/init.d/netfs | 28 | ||||
| -rwxr-xr-x | rc.d/init.d/random | 4 |
3 files changed, 25 insertions, 25 deletions
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt index fc463b21..48b3a328 100755 --- a/rc.d/init.d/halt +++ b/rc.d/init.d/halt @@ -45,7 +45,7 @@ esac runcmd "Sending all processes the TERM signal..." /sbin/killall5 -15 sleep 5 -runcmd "Sending all processes the KILL signal.." /sbin/killall5 -9 +runcmd "Sending all processes the KILL signal..." /sbin/killall5 -9 # Write to wtmp file before unmounting /var halt -w @@ -58,11 +58,11 @@ fi # Turn off swap, then unmount file systems. SWAPS=`awk '! /^Filename/ { print $1 }' /proc/swaps` -[ -n "$SWAPS" ] && runcmd "Turning off swap" swapoff $SWAPS +[ -n "$SWAPS" ] && runcmd "Turning off swap: " swapoff $SWAPS -[ -x /sbin/accton ] && runcmd "Turning off accounting" /sbin/accton +[ -x /sbin/accton ] && runcmd "Turning off accounting: " /sbin/accton -[ -x /sbin/quotaoff ] && runcmd "Turning off quotas" /sbin/quotaoff -a +[ -x /sbin/quotaoff ] && runcmd "Turning off quotas: " /sbin/quotaoff -a # Unmount file systems, killing processes if we have to. sig= @@ -71,9 +71,9 @@ remaining=`awk '!/(^#|proc|loopfs|^none|^\/dev\/root| \/ )/ {print $2}' /proc/mo while [ -n "$remaining" -a "$retry" -gt 0 ] do if [ "$retry" -lt 3 ]; then - runcmd "Unmounting file systems (retry)" umount -a -f -t noproc + runcmd "Unmounting file systems (retry): " umount -a -f -t noproc else - runcmd "Unmounting file systems" umount -a -f -t noproc + runcmd "Unmounting file systems: " umount -a -f -t noproc fi sleep 2 remaining=`awk '!/(^#|proc|loopfs|^none|^\/dev\/root| \/ )/ {print $2}' /proc/mounts` @@ -92,11 +92,11 @@ if [ -x /sbin/raidstop -a -f /etc/raidtab ]; then if [ -f /proc/mdstat ] ; then mddevs=$(grep ^md /proc/mdstat | awk '{ print $1 }') for mddev in $mddevs ; do - runcmd "Turning off RAID for $mddev" raidstop /dev/$mddev + runcmd "Turning off RAID for $mddev: " raidstop /dev/$mddev done unset mddev mddevs fi - #runcmd "Turning off RAID" /sbin/raidstop -a + #runcmd "Turning off RAID: " /sbin/raidstop -a fi [ -f /proc/bus/usb/devices ] && umount /proc/bus/usb @@ -107,7 +107,7 @@ mount | awk '/ext2/ { print $3 }' | while read line; do mount -n -o ro,remount $line done -runcmd "Unmounting proc file system" umount /proc +runcmd "Unmounting proc file system: " umount /proc # Now halt or reboot. echo "$message" diff --git a/rc.d/init.d/netfs b/rc.d/init.d/netfs index 6e80e0ea..929171fc 100755 --- a/rc.d/init.d/netfs +++ b/rc.d/init.d/netfs @@ -32,11 +32,11 @@ NCPMTAB=`grep -v '^#' /proc/mounts | awk '{ if ($3 ~ /^ncpfs$/ ) print $2}'` # See how we were called. case "$1" in start) - [ -n "$NFSFSTAB" ] && action "Mounting NFS filesystems" mount -a -t nfs - [ -n "$SMBFSTAB" ] && action "Mounting SMB filesystems" mount -a -t smbfs - [ -n "$NCPFSTAB" ] && action "Mounting NCP filesystems" mount -a -t ncpfs + [ -n "$NFSFSTAB" ] && action "Mounting NFS filesystems: " mount -a -t nfs + [ -n "$SMBFSTAB" ] && action "Mounting SMB filesystems: " mount -a -t smbfs + [ -n "$NCPFSTAB" ] && action "Mounting NCP filesystems: " mount -a -t ncpfs touch /var/lock/subsys/netfs - action "Mounting other filesystems" mount -a -t noproc,nonfs,smbfs,ncpfs + action "Mounting other filesystems: " mount -a -t noproc,nonfs,smbfs,ncpfs ;; stop) [ -n "$NFSMTAB" ] && { @@ -46,9 +46,9 @@ case "$1" in while [ -n "$remaining" -a "$retry" -gt 0 ] do if [ "$retry" -lt 3 ]; then - action "Unmounting NFS filesystems (retry)" umount -f -a -t nfs + action "Unmounting NFS filesystems (retry): " umount -f -a -t nfs else - action "Unmounting NFS filesystems" umount -f -a -t nfs + action "Unmounting NFS filesystems: " umount -f -a -t nfs fi sleep 2 remaining=`awk '!/^#/ && $3 ~ /^nfs/ && $2 != "/" {print $2}' /proc/mounts` @@ -59,34 +59,34 @@ case "$1" in sig=-9 done } - [ -n "$SMBMTAB" ] && action "Unmounting SMB filesystems" umount -a -t smbfs - [ -n "$NCPMTAB" ] && action "Unmounting NCP filesystems" umount -a -t ncpfs + [ -n "$SMBMTAB" ] && action "Unmounting SMB filesystems: " umount -a -t smbfs + [ -n "$NCPMTAB" ] && action "Unmounting NCP filesystems: " umount -a -t ncpfs rm -f /var/lock/subsys/netfs ;; status) if [ -f /proc/mounts ] ; then [ -n "$NFSFSTAB" ] && { - echo "Configured NFS mountpoints:" + echo "Configured NFS mountpoints: " for fs in $NFSFSTAB; do echo $fs ; done } [ -n "$SMBFSTAB" ] && { - echo "Configured SMB mountpoints:" + echo "Configured SMB mountpoints: " for fs in $SMBFSTAB; do echo $fs ; done } [ -n "$NCPFSTAB" ] && { - echo "Configured NCP mountpoints:" + echo "Configured NCP mountpoints: " for fs in $NCPFSTAB; do echo $fs ; done } [ -n "$NFSMTAB" ] && { - echo "Active NFS mountpoints:" + echo "Active NFS mountpoints: " for fs in $NFSMTAB; do echo $fs ; done } [ -n "$SMBMTAB" ] && { - echo "Active SMB mountpoints:" + echo "Active SMB mountpoints: " for fs in $SMBMTAB; do echo $fs ; done } [ -n "$NCPMTAB" ] && { - echo "Active NCP mountpoints:" + echo "Active NCP mountpoints: " for fs in $NCPMTAB; do echo $fs ; done } else diff --git a/rc.d/init.d/random b/rc.d/init.d/random index 42dce627..81c7a780 100755 --- a/rc.d/init.d/random +++ b/rc.d/init.d/random @@ -23,7 +23,7 @@ case "$1" in else touch $random_seed fi - action "Initializing random number generator" /bin/true + action "Initializing random number generator: " /bin/true chmod 600 $random_seed dd if=/dev/urandom of=$random_seed count=1 bs=512 2>/dev/null touch /var/lock/subsys/random @@ -34,7 +34,7 @@ case "$1" in # Save 512 bytes, which is the size of the entropy pool touch $random_seed chmod 600 $random_seed - action "Saving random seed" dd if=/dev/urandom of=$random_seed count=1 bs=512 2>/dev/null + action "Saving random seed: " dd if=/dev/urandom of=$random_seed count=1 bs=512 2>/dev/null rm -f /var/lock/subsys/random ;; |