From 91f2087cffbf3201d6b605191454d15ec127b976 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 29 Sep 2004 02:26:03 +0000
Subject: fix checkpid logic, clean up potential errors (#134030)

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

(limited to 'rc.d')

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 819230fd..0f6dbfe6 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -73,9 +73,9 @@ checkpid() {
 	local i
 
 	for i in $* ; do
-		[ -d "/proc/$i" ] || return 1
+		[ -d "/proc/$i" ] && return 0
 	done
-	return 0
+	return 1
 }
 	
 
@@ -193,12 +193,12 @@ killproc() {
 		if [ "$notset" -eq "1" ] ; then
 		       if checkpid $pid 2>&1; then
 			   # TERM first, then KILL if not dead
-			   kill -TERM $pid
+			   kill -TERM $pid >/dev/null 2>&1
 			   usleep 100000
 			   if checkpid $pid && sleep 1 &&
 			      checkpid $pid && sleep 3 &&
 			      checkpid $pid ; then
-                                kill -KILL $pid
+                                kill -KILL $pid >/dev/null 2>&1
 				usleep 100000
 			   fi
 		        fi
@@ -209,7 +209,7 @@ killproc() {
 		# use specified level only
 		else
 		        if checkpid $pid; then
-	                	kill $killlevel $pid
+	                	kill $killlevel $pid >/dev/null 2>&1
 				RC=$?
 				[ "$RC" -eq 0 ] && success $"$base $killlevel" || failure $"$base $killlevel"
 			fi
-- 
cgit v1.2.1