summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-08-19 21:34:21 +0000
committerRichard Purdie <richard@openedhand.com>2008-08-19 21:34:21 +0000
commit513bf3ac50f57b0d481e3a14d870e38318d1e147 (patch)
tree731a0226998e6c35b77e8cc7c588677f754150db
parent37d9ffa5d40ae81d7f11d199d8130933090dba03 (diff)
downloadpoky-513bf3ac50f57b0d481e3a14d870e38318d1e147.tar.gz
xserver-nodm: Remove another fork, no need to use cat here
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5081 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-nodm3
2 files changed, 3 insertions, 2 deletions
diff --git a/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb b/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb
index ff1b4d529a..46cb164a51 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 = "r16" 5PR = "r17"
6RDEPENDS = "dbus-wait" 6RDEPENDS = "dbus-wait"
7 7
8SRC_URI = "file://xserver-nodm" 8SRC_URI = "file://xserver-nodm"
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 4996634156..f6399fc1fa 100755
--- a/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
+++ b/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
@@ -13,7 +13,8 @@ killproc() { # kill the named process(es)
13 [ "$pid" != "" ] && kill $pid 13 [ "$pid" != "" ] && kill $pid
14} 14}
15 15
16for x in $(cat /proc/cmdline); do 16read CMDLINE < /proc/cmdline
17for x in $CMDLINE; do
17 case $x in 18 case $x in
18 x11=false) 19 x11=false)
19 echo "X Server disabled" 20 echo "X Server disabled"