diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-06-13 14:21:01 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-06-13 14:21:01 +0000 |
| commit | f37e581b877f9705db219cc3f77535b3f7639cc0 (patch) | |
| tree | e88af802e0b6330c7702d46058b4b2f1fb8796a4 | |
| parent | 7f5b6f93394116ce3a4868b386f3cee9f1129f9b (diff) | |
| download | poky-f37e581b877f9705db219cc3f77535b3f7639cc0.tar.gz | |
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/functions | 5 | ||||
| -rw-r--r-- | 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 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 | |||
| 9 | } | 9 | } |
| 10 | 10 | ||
| 11 | killproc() { # kill the named process(es) | 11 | killproc() { # kill the named process(es) |
| 12 | pid=`/bin/ps -e x | | 12 | pid=`/bin/pidof $1` |
| 13 | /bin/grep $1 | | ||
| 14 | /bin/grep -v grep | | ||
| 15 | /bin/sed -e 's/^ *//' -e 's/ .*//'` | ||
| 16 | [ "$pid" != "" ] && kill $pid | 13 | [ "$pid" != "" ] && kill $pid |
| 17 | } | 14 | } |
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" | |||
| 4 | DEPENDS = "makedevs" | 4 | DEPENDS = "makedevs" |
| 5 | RDEPENDS = "makedevs" | 5 | RDEPENDS = "makedevs" |
| 6 | LICENSE = "GPL" | 6 | LICENSE = "GPL" |
| 7 | PR = "r109" | 7 | PR = "r110" |
| 8 | 8 | ||
| 9 | SRC_URI = "file://functions \ | 9 | SRC_URI = "file://functions \ |
| 10 | file://halt \ | 10 | file://halt \ |
