From 8c5be6ef146581a11f3262e05a5c60710afac66c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 22 Jun 2006 09:28:53 +0000 Subject: xserver-nodm: Run the script in the background so if xtscal locks, the rest of the boot process continues and you can get to a shell. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@492 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../packages/xserver-kdrive-common/xserver-nodm-init.bb | 2 +- .../xserver-kdrive-common/xserver-nodm-init/xserver-nodm | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'openembedded') 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) -- cgit v1.2.3