aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec2
-rwxr-xr-xrc.d/init.d/functions8
2 files changed, 5 insertions, 5 deletions
diff --git a/initscripts.spec b/initscripts.spec
index cff20de3..97779d68 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 29661799..a7c8fcab 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() {