diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-08-19 21:34:21 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-08-19 21:34:21 +0000 |
| commit | 513bf3ac50f57b0d481e3a14d870e38318d1e147 (patch) | |
| tree | 731a0226998e6c35b77e8cc7c588677f754150db /meta/packages/xserver-kdrive-common | |
| parent | 37d9ffa5d40ae81d7f11d199d8130933090dba03 (diff) | |
| download | openembedded-core-513bf3ac50f57b0d481e3a14d870e38318d1e147.tar.gz openembedded-core-513bf3ac50f57b0d481e3a14d870e38318d1e147.tar.bz2 openembedded-core-513bf3ac50f57b0d481e3a14d870e38318d1e147.zip | |
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
Diffstat (limited to 'meta/packages/xserver-kdrive-common')
| -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 | 3 |
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)" LICENSE = "GPL" SECTION = "x11" PRIORITY = "optional" -PR = "r16" +PR = "r17" RDEPENDS = "dbus-wait" SRC_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) [ "$pid" != "" ] && kill $pid } -for x in $(cat /proc/cmdline); do +read CMDLINE < /proc/cmdline +for x in $CMDLINE; do case $x in x11=false) echo "X Server disabled" |