diff options
| author | Bill Nottingham <notting@redhat.com> | 2005-04-25 22:12:19 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2005-04-25 22:12:19 +0000 |
| commit | 2b4f68e224c2fd4b472176f107f7f5aac125ef80 (patch) | |
| tree | fe7ad420b396888e11cce83f24879c3ded2b4d28 | |
| parent | 969968447db802f55acc6587cbb399ac6afde5d3 (diff) | |
| download | initscripts-2b4f68e224c2fd4b472176f107f7f5aac125ef80.tar initscripts-2b4f68e224c2fd4b472176f107f7f5aac125ef80.tar.gz initscripts-2b4f68e224c2fd4b472176f107f7f5aac125ef80.tar.bz2 initscripts-2b4f68e224c2fd4b472176f107f7f5aac125ef80.tar.xz initscripts-2b4f68e224c2fd4b472176f107f7f5aac125ef80.zip | |
use pidof -c in various functions
| -rw-r--r-- | initscripts.spec | 2 | ||||
| -rwxr-xr-x | rc.d/init.d/functions | 8 |
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() { |