From f37e581b877f9705db219cc3f77535b3f7639cc0 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Fri, 13 Jun 2008 14:21:01 +0000
Subject: initscripts: use pidof command in killproc() function

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4643 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/initscripts/initscripts-1.0/functions | 5 +----
 meta/packages/initscripts/initscripts_1.0.bb        | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/meta/packages/initscripts/initscripts-1.0/functions b/meta/packages/initscripts/initscripts-1.0/functions
index 358fc6edb..514618770 100644
--- a/meta/packages/initscripts/initscripts-1.0/functions
+++ b/meta/packages/initscripts/initscripts-1.0/functions
@@ -9,9 +9,6 @@ cpuinfo_id() {		# return the Hardware module ID
 }
 
 killproc() {		# kill the named process(es)
-    pid=`/bin/ps -e x |
-         /bin/grep $1 |
-         /bin/grep -v grep |
-         /bin/sed -e 's/^  *//' -e 's/ .*//'`
+    pid=`/bin/pidof $1`
     [ "$pid" != "" ] && kill $pid
 }
diff --git a/meta/packages/initscripts/initscripts_1.0.bb b/meta/packages/initscripts/initscripts_1.0.bb
index 6f65e12bb..16f987e49 100644
--- a/meta/packages/initscripts/initscripts_1.0.bb
+++ b/meta/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 DEPENDS = "makedevs"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r109"
+PR = "r110"
 
 SRC_URI = "file://functions \
            file://halt \
-- 
cgit v1.2.3