From 14ac181bc961bd8691fe4db9225f8e13f672ff74 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Thu, 4 Feb 1999 20:17:57 +0000
Subject: bugfixes for 'old' mode

---
 rc.d/init.d/functions | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'rc.d/init.d/functions')

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
-- 
cgit v1.2.1