summaryrefslogtreecommitdiffstats
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)
downloadpoky-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.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 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)"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4PRIORITY = "optional" 4PRIORITY = "optional"
5PR = "r8" 5PR = "r9"
6 6
7SRC_URI = "file://xserver-nodm" 7SRC_URI = "file://xserver-nodm"
8S = ${WORKDIR} 8S = ${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
3killproc() { # kill the named process(es) 3killproc() { # 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