From 2b4f68e224c2fd4b472176f107f7f5aac125ef80 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 25 Apr 2005 22:12:19 +0000
Subject: [PATCH] use pidof -c in various functions

---
 initscripts.spec      | 2 +-
 rc.d/init.d/functions | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/initscripts.spec b/initscripts.spec
index cff20de30..97779d682 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -13,7 +13,7 @@ Requires: /sbin/sysctl, sysklogd >= 1.3.31
 Requires: /sbin/fuser, /bin/grep
 Requires: module-init-tools
 Requires: util-linux >= 2.10s-11, mount >= 2.11l
-Requires: bash >= 3.0, SysVinit
+Requires: bash >= 3.0, SysVinit >= 2.85-38
 Requires: /sbin/ip, /sbin/arping, net-tools
 Requires: /etc/redhat-release, dev
 Requires: ethtool >= 1.8-2, kernel >= 2.6, /sbin/nash, /sbin/runuser
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index 29661799e..a7c8fcaba 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -183,8 +183,8 @@ killproc() {
 		done
 	fi
 	if [ -z "$pid" ]; then
-		pid=`pidof -o $$ -o $PPID -o %PPID -x $1 || \
-			pidof -o $$ -o $PPID -o %PPID -x $base`
+		pid=`pidof -c -o $$ -o $PPID -o %PPID -x $1 || \
+			pidof -c -o $$ -o $PPID -o %PPID -x $base`
 	fi
 
         # Kill it.
@@ -272,8 +272,8 @@ pidofproc() {
 	                return 0
 	        fi
 	fi
-	pidof -o $$ -o $PPID -o %PPID -x $1 || \
-		pidof -o $$ -o $PPID -o %PPID -x $base
+	pidof -c -o $$ -o $PPID -o %PPID -x $1 || \
+		pidof -c -o $$ -o $PPID -o %PPID -x $base
 }
 
 status() {