summaryrefslogtreecommitdiff
path: root/openembedded
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-06-22 09:28:53 +0000
committerRichard Purdie <richard@openedhand.com>2006-06-22 09:28:53 +0000
commit8c5be6ef146581a11f3262e05a5c60710afac66c (patch)
treeeb367b7500bc4606c0c1b1b074e53511284c52fb /openembedded
parent7869b57fd55e9e11028064ef4a6e2cb26d97480d (diff)
downloadopenembedded-core-8c5be6ef146581a11f3262e05a5c60710afac66c.tar.gz
openembedded-core-8c5be6ef146581a11f3262e05a5c60710afac66c.tar.bz2
openembedded-core-8c5be6ef146581a11f3262e05a5c60710afac66c.tar.xz
openembedded-core-8c5be6ef146581a11f3262e05a5c60710afac66c.zip
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
Diffstat (limited to 'openembedded')
-rw-r--r--openembedded/packages/xserver-kdrive-common/xserver-nodm-init.bb2
-rwxr-xr-xopenembedded/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm10
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)