From e8d2f95c03d1df94ca6ab9bab11f0f1d8e8c5893 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Thu, 4 Feb 1999 01:03:34 +0000
Subject: bugfixes...

---
 rc.d/init.d/functions | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

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

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 525ecc6d..c3b42a65 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -79,18 +79,18 @@ killproc() {
                 [ $BOOTUP != "color" ] && echo -n $base
 		if [ "$notset" = 1 ] ; then
 			# TERM first, then KILL if not dead
-			kill -TERM $pid
+			kill -TERM $pid && success -n "$base shutdown" || failure -n "$base shutdown"
 			usleep 100000
 			if ps h $pid >/dev/null 2>&1 ; then
 				sleep 1
-				if ps h $pid >/dev/null 2>&1
+				if ps h $pid >/dev/null 2>&1 ; then
 					sleep 3
-					kill -KILL $pid && success "$base shutdown" || failure "$base shutdown"
+					kill -KILL $pid && success -n "$base shutdown" || failure -n "$base shutdown"
 				fi
 			fi
 		# use specified level only
 		else
-	                kill $killlevel $pid && success "$base shutdown" || failure "$base shutdown"
+	                kill $killlevel $pid && success -n "$base shutdown" || failure -n "$base shutdown"
 		fi
 	else
 	    failure -n "$base shutdown"
@@ -263,6 +263,3 @@ confirm() {
     ;;
     esac
 }
-
-    
-  
-- 
cgit v1.2.1