summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-03-05 15:52:52 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-03-05 15:52:52 +0000
commit75b40f10777138681f21e5216b9a1e5821542b4c (patch)
treef8fd8aa65359c04882585ce391c44df8c67be8e3
parent68fb84840419eecfd528d658152b5d10d50e0e76 (diff)
downloadopenembedded-core-75b40f10777138681f21e5216b9a1e5821542b4c.tar.gz
openembedded-core-75b40f10777138681f21e5216b9a1e5821542b4c.tar.bz2
openembedded-core-75b40f10777138681f21e5216b9a1e5821542b4c.tar.xz
openembedded-core-75b40f10777138681f21e5216b9a1e5821542b4c.zip
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.bb2
-rwxr-xr-xmeta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm5
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 cea9f0cb2..bea21793a 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)"
LICENSE = "GPL"
SECTION = "x11"
PRIORITY = "optional"
-PR = "r8"
+PR = "r9"
SRC_URI = "file://xserver-nodm"
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 a56edaa15..6a04efe86 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 @@
#!/bin/sh
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
}