summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-06-13 14:21:01 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-06-13 14:21:01 +0000
commitf37e581b877f9705db219cc3f77535b3f7639cc0 (patch)
treee88af802e0b6330c7702d46058b4b2f1fb8796a4
parent7f5b6f93394116ce3a4868b386f3cee9f1129f9b (diff)
downloadopenembedded-core-f37e581b877f9705db219cc3f77535b3f7639cc0.tar.gz
openembedded-core-f37e581b877f9705db219cc3f77535b3f7639cc0.tar.bz2
openembedded-core-f37e581b877f9705db219cc3f77535b3f7639cc0.zip
initscripts: use pidof command in killproc() function
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4643 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/initscripts/initscripts-1.0/functions5
-rw-r--r--meta/packages/initscripts/initscripts_1.0.bb2
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 358fc6edb3..514618770a 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 6f65e12bb4..16f987e49e 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 \