diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-05 15:52:52 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-05 15:52:52 +0000 |
commit | 75b40f10777138681f21e5216b9a1e5821542b4c (patch) | |
tree | f8fd8aa65359c04882585ce391c44df8c67be8e3 | |
parent | 68fb84840419eecfd528d658152b5d10d50e0e76 (diff) | |
download | poky-75b40f10777138681f21e5216b9a1e5821542b4c.tar.gz |
xserver-nodm-init: use pidof instead of ps|grep|grep|sed to get PID of xinit
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3949 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r-- | meta/packages/xserver-kdrive-common/xserver-nodm-init.bb | 2 | ||||
-rwxr-xr-x | meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb b/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb index cea9f0cb28..bea21793a6 100644 --- a/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb +++ b/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb | |||
@@ -2,7 +2,7 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)" | |||
2 | LICENSE = "GPL" | 2 | LICENSE = "GPL" |
3 | SECTION = "x11" | 3 | SECTION = "x11" |
4 | PRIORITY = "optional" | 4 | PRIORITY = "optional" |
5 | PR = "r8" | 5 | PR = "r9" |
6 | 6 | ||
7 | SRC_URI = "file://xserver-nodm" | 7 | SRC_URI = "file://xserver-nodm" |
8 | S = ${WORKDIR} | 8 | S = ${WORKDIR} |
diff --git a/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm index a56edaa15b..6a04efe860 100755 --- a/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm +++ b/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm | |||
@@ -1,10 +1,7 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | killproc() { # kill the named process(es) | 3 | killproc() { # kill the named process(es) |
4 | pid=`/bin/ps -e x | | 4 | pid=`/bin/pidof $1` |
5 | /bin/grep $1 | | ||
6 | /bin/grep -v grep | | ||
7 | /bin/sed -e 's/^ *//' -e 's/ .*//'` | ||
8 | [ "$pid" != "" ] && kill $pid | 5 | [ "$pid" != "" ] && kill $pid |
9 | } | 6 | } |
10 | 7 | ||