From 0e3b51151772e767bc7bff4e5fb7295ecc5e8217 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Thu, 9 Sep 2010 17:21:08 -0400
Subject: Use new -m option to pidof. Require new enough sysvinit-tools.
 (#632321)

---
 initscripts.spec      | 2 +-
 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##*/}"
 }
 
 
-- 
cgit v1.2.1