diff options
| author | Carsten Haitzler <raster@openmoko.org> | 2009-04-14 20:33:12 +1000 |
|---|---|---|
| committer | Carsten Haitzler <raster@openmoko.org> | 2009-04-14 23:25:16 +1000 |
| commit | b7555d7d3a43d5b6519c924fbf7eb905830248fd (patch) | |
| tree | dd474393a1ab93aa908df459a8cd2b9b4947099f | |
| parent | 631decbb48e30d3043a17cc5bd94c0ac75f885f9 (diff) | |
xserver-kdrive-common: fix start script to suport background opt and up pkgrev
| -rw-r--r-- | recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb | 2 | ||||
| -rwxr-xr-x | recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb index 9667c479f6..6b585c44e0 100644 --- a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb +++ b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Common X11 scripts" LICENSE = "GPL" SECTION = "x11" -PR = "r34" +PR = "r36" SRC_URI = "\ file://Xdefaults \ 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) |