summaryrefslogtreecommitdiff
path: root/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm')
-rwxr-xr-xrecipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm17
1 files changed, 10 insertions, 7 deletions
diff --git a/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
index 28ba65cd52..1f0fa47be6 100755
--- a/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
+++ b/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
@@ -19,13 +19,16 @@ done
case "$1" in
start)
- . /etc/profile
- [ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
- [ -z $HOME ] && export HOME=/home/$LOGNAME
-
-
- echo "Starting Xserver"
- /etc/X11/Xserver &
+ # We don't want this script to block the rest of the boot process
+ if [ "$2" != "background" ]; then
+ $0 $1 background &
+ else
+ . /etc/profile
+ [ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root
+ [ -z $HOME ] && export HOME=/home/$LOGNAME
+ echo "Starting Xserver"
+ /etc/X11/Xserver &
+ fi
;;
stop)