diff options
| author | Bill Nottingham <notting@redhat.com> | 2010-09-09 17:21:08 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2010-09-14 10:57:26 -0400 |
| commit | 0e3b51151772e767bc7bff4e5fb7295ecc5e8217 (patch) | |
| tree | 22ae86dbbe7f8e01fdedc3ee50f1c7d5bf5b32c1 | |
| parent | f3d1abbd95d1c9bae60db2c8483282dc3413650a (diff) | |
| download | initscripts-0e3b51151772e767bc7bff4e5fb7295ecc5e8217.tar initscripts-0e3b51151772e767bc7bff4e5fb7295ecc5e8217.tar.gz initscripts-0e3b51151772e767bc7bff4e5fb7295ecc5e8217.tar.bz2 initscripts-0e3b51151772e767bc7bff4e5fb7295ecc5e8217.tar.xz initscripts-0e3b51151772e767bc7bff4e5fb7295ecc5e8217.zip | |
Use new -m option to pidof. Require new enough sysvinit-tools. (#632321)
| -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 7910a0a2..5ddb58ab 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -19,7 +19,7 @@ Requires: /sbin/pidof, /sbin/blkid Requires: module-init-tools Requires: util-linux-ng >= 2.16 Requires: bash >= 3.0 -Requires: sysvinit-tools >= 2.87 +Requires: sysvinit-tools >= 2.87-5 Requires: sysvinit-userspace %if %{_with_upstart} Conflicts: upstart < 0.6.0 diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 3fedd87b..366c137f 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -204,8 +204,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##*/}" } |