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
This commit is contained in:
parent
7869b57fd5
commit
8c5be6ef14
|
@ -2,7 +2,7 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)"
|
||||||
LICENSE = "GPL"
|
LICENSE = "GPL"
|
||||||
SECTION = "x11"
|
SECTION = "x11"
|
||||||
PRIORITY = "optional"
|
PRIORITY = "optional"
|
||||||
PR = "r3"
|
PR = "r6"
|
||||||
|
|
||||||
SRC_URI = "file://xserver-nodm"
|
SRC_URI = "file://xserver-nodm"
|
||||||
S = ${WORKDIR}
|
S = ${WORKDIR}
|
||||||
|
|
|
@ -8,12 +8,19 @@ killproc() { # kill the named process(es)
|
||||||
[ "$pid" != "" ] && kill $pid
|
[ "$pid" != "" ] && kill $pid
|
||||||
}
|
}
|
||||||
|
|
||||||
. /etc/profile
|
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
start)
|
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"
|
echo "Starting Xserver"
|
||||||
/etc/X11/Xserver &
|
/etc/X11/Xserver &
|
||||||
|
|
||||||
export DISPLAY=:0
|
export DISPLAY=:0
|
||||||
|
|
||||||
while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ]
|
while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ]
|
||||||
|
@ -22,6 +29,7 @@ case "$1" in
|
||||||
done
|
done
|
||||||
|
|
||||||
/etc/X11/Xsession &
|
/etc/X11/Xsession &
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
stop)
|
stop)
|
||||||
|
|
Loading…
Reference in New Issue