diff options
author | Bill Nottingham <notting@redhat.com> | 2010-09-09 17:21:08 -0400 |
---|---|---|
committer | Lukas Nykryn <lnykryn@redhat.com> | 2015-03-02 07:12:34 +0100 |
commit | 31cb38acfa4cdbfaa65a81cf0c95a3675eeefc27 (patch) | |
tree | fab8acb6ef3291340104e27df26a868dcf3bec86 | |
parent | 20d9baedc182227e922525fccb6ff6f672d1ed48 (diff) | |
download | initscripts-31cb38acfa4cdbfaa65a81cf0c95a3675eeefc27.tar initscripts-31cb38acfa4cdbfaa65a81cf0c95a3675eeefc27.tar.gz initscripts-31cb38acfa4cdbfaa65a81cf0c95a3675eeefc27.tar.bz2 initscripts-31cb38acfa4cdbfaa65a81cf0c95a3675eeefc27.tar.xz initscripts-31cb38acfa4cdbfaa65a81cf0c95a3675eeefc27.zip |
Use new -m option to pidof. Require new enough sysvinit-tools. (#632321)
Conflicts:
initscripts.spec
-rw-r--r-- | initscripts.spec | 2 | ||||
-rw-r--r-- | rc.d/init.d/functions | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/initscripts.spec b/initscripts.spec index 6637a8d4..822fd4c5 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -17,7 +17,7 @@ Requires: /sbin/pidof, /sbin/blkid Requires: module-init-tools >= 3.9-25 Requires: util-linux-ng >= 2.16 Requires: bash >= 3.0 -Requires: sysvinit-tools >= 2.87 +Requires: sysvinit-tools >= 2.87-6 %if with_upstart Requires: upstart >= 0.6.5-11 %else diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index e3cae113..27226657 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -182,8 +182,8 @@ __pids_var_run() { # Output PIDs of matching processes, found using pidof __pids_pidof() { - pidof -c -o $$ -o $PPID -o %PPID -x "$1" || \ - pidof -c -o $$ -o $PPID -o %PPID -x "${1##*/}" + pidof -c -m -o $$ -o $PPID -o %PPID -x "$1" || \ + pidof -c -m -o $$ -o $PPID -o %PPID -x "${1##*/}" } |