diff options
Diffstat (limited to 'meta')
-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 | 9 |
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 d1ed98dfaf..cea9f0cb28 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 be405bc008..a56edaa15b 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 |