summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorMatthew Allum <mallum@openedhand.com>2006-09-03 14:26:12 +0000
committerMatthew Allum <mallum@openedhand.com>2006-09-03 14:26:12 +0000
commitf8b1e634eb3cfc6e59e9fe11b8a198aec6bd3d29 (patch)
treeeaf27bee8014a7ba1face4b44b24748975e98c4a /meta
parentf1f8c5a6a7234a7b618f98efbb3d28e414890fa9 (diff)
downloadopenembedded-core-f8b1e634eb3cfc6e59e9fe11b8a198aec6bd3d29.tar.gz
openembedded-core-f8b1e634eb3cfc6e59e9fe11b8a198aec6bd3d29.tar.bz2
openembedded-core-f8b1e634eb3cfc6e59e9fe11b8a198aec6bd3d29.tar.xz
openembedded-core-f8b1e634eb3cfc6e59e9fe11b8a198aec6bd3d29.zip
Check /proc/cmdline for 'x11=false' to disable X server startup
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@695 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/xserver-kdrive-common/xserver-nodm-init.bb2
-rwxr-xr-xmeta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm9
2 files changed, 10 insertions, 1 deletions
diff --git a/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb b/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb
index d1ed98dfa..cea9f0cb2 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 = "r7"
+PR = "r8"
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 be405bc00..a56edaa15 100755
--- a/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
+++ b/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
@@ -8,6 +8,15 @@ killproc() { # kill the named process(es)
[ "$pid" != "" ] && kill $pid
}
+for x in $(cat /proc/cmdline); do
+ case $x in
+ x11=false)
+ echo "X Server disabled"
+ exit 0;
+ ;;
+ esac
+done
+
case "$1" in
start)
# We don't want this script to block the rest of the boot process