From 513bf3ac50f57b0d481e3a14d870e38318d1e147 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 19 Aug 2008 21:34:21 +0000 Subject: 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 --- meta/packages/xserver-kdrive-common/xserver-nodm-init.bb | 2 +- meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'meta') diff --git a/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb b/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb index ff1b4d529..46cb164a5 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 499663415..f6399fc1f 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" -- cgit v1.2.3