aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Haitzler (Raster <raster@rasterman.com>2008-10-30 15:00:31 +1100
committerCarsten Haitzler (Raster) <raster@rasterman.com>2009-02-20 00:55:52 +1100
commite4da1a4db5a81d3ece69acc0315460e8b988d6fc (patch)
tree518c1bc0669822f1faff47dfd9ab26a2261e39bd
parent5edba38e8b30a84e33a1149bfb16408f8717e83a (diff)
downloadopenembedded-e4da1a4db5a81d3ece69acc0315460e8b988d6fc.tar.gz
xserver-kdrive-common: fix xserver-nodm to set HOME env var right
for a long time xserver-nodm has not set HOME correctly so all apps think HOME is /. this fixes that.
-rwxr-xr-xpackages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm17
1 files changed, 10 insertions, 7 deletions
diff --git a/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
index 28ba65cd52..1f0fa47be6 100755
--- a/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
+++ b/packages/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)