aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d/init.d
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>1999-02-04 20:17:57 +0000
committerBill Nottingham <notting@redhat.com>1999-02-04 20:17:57 +0000
commit14ac181bc961bd8691fe4db9225f8e13f672ff74 (patch)
treea83ff0f95d6defee733ac5cdfdff372f297f543a /rc.d/init.d
parent259187b07b6e775ce79671f910cab860682e3912 (diff)
downloadinitscripts-14ac181bc961bd8691fe4db9225f8e13f672ff74.tar
initscripts-14ac181bc961bd8691fe4db9225f8e13f672ff74.tar.gz
initscripts-14ac181bc961bd8691fe4db9225f8e13f672ff74.tar.bz2
initscripts-14ac181bc961bd8691fe4db9225f8e13f672ff74.tar.xz
initscripts-14ac181bc961bd8691fe4db9225f8e13f672ff74.zip
bugfixes for 'old' mode
Diffstat (limited to 'rc.d/init.d')
-rwxr-xr-xrc.d/init.d/functions13
-rwxr-xr-xrc.d/init.d/halt2
2 files changed, 11 insertions, 4 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 882748f7..95f970fd 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -212,7 +212,8 @@ action() {
if [ -z "$IN_INITLOG" ]; then
initlog $INITLOG_ARGS -c "$*" && success "$STRING" || failure "$STRING"
rc=$?
- [ "$BOOTUP" = "color" ] && echo
+# [ "$BOOTUP" = "color" ] && echo
+ echo
return $rc
else
# This sucks.
@@ -225,10 +226,16 @@ action() {
fi
if [ $rc ]; then
- [ "$BOOTUP" = "color" ] || { echo ; echo $output ; }
+ [ "$BOOTUP" != "color" ] && {
+ if [ -n "$output" ]; then
+ echo
+ echo $output
+ else
+ echo
+ fi
+ }
success "$STRING"
else
- echo
echo $output
failure "$STRING"
fi
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index 08cf9b67..198767c0 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -14,7 +14,7 @@ PATH=/sbin:/bin:/usr/bin:/usr/sbin
. /etc/rc.d/init.d/functions
runcmd() {
- echo -n $1
+ echo -n "$1 "
shift
if [ "$BOOTUP" = "color" ]; then
$* && echo_success || echo_failure