diff options
| -rw-r--r-- | openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb | 2 | ||||
| -rwxr-xr-x | openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb index 8b79b4bdd..5dff88918 100644 --- a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb +++ b/openembedded/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 = "r3" +PR = "r6" SRC_URI = "file://xserver-nodm" S = ${WORKDIR} diff --git a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm index 1c6f742a1..eeab55a71 100755 --- a/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm +++ b/openembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm @@ -8,12 +8,19 @@ killproc() { # kill the named process(es) [ "$pid" != "" ] && kill $pid } -. /etc/profile + case "$1" in start) + # We don't want this script to block the rest of the boot process + if [ "$2" != "background" ]; then + $0 $1 background & + else + . /etc/profile + echo "Starting Xserver" /etc/X11/Xserver & + export DISPLAY=:0 while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ] @@ -22,6 +29,7 @@ case "$1" in done /etc/X11/Xsession & + fi ;; stop) |