diff options
| author | John Lee <john_lee@openmoko.org> | 2009-01-12 14:39:16 +0800 |
|---|---|---|
| committer | John Lee <john_lee@openmoko.org> | 2009-01-12 14:39:16 +0800 |
| commit | 366bf6043abfbbbfa98168548f42aa9aaf6c28b9 (patch) | |
| tree | ec24779b5ed382cbd3077595cd54a62fad4741c7 /packages/xserver-kdrive-common | |
| parent | b4e78908d6ed0b4a142dabc9e72b1a81b7f3c581 (diff) | |
| parent | 5c898f6e20d5d27a1cc0747746d35f706fd6dfff (diff) | |
Merge commit 'origin/john_lee/fastboot-devel' into org.openembedded.dev
Diffstat (limited to 'packages/xserver-kdrive-common')
| -rw-r--r-- | packages/xserver-kdrive-common/xserver-nodm-init.bb | 13 | ||||
| -rwxr-xr-x | packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm | 19 |
2 files changed, 18 insertions, 14 deletions
diff --git a/packages/xserver-kdrive-common/xserver-nodm-init.bb b/packages/xserver-kdrive-common/xserver-nodm-init.bb index bea21793a6..cba56d55a3 100644 --- a/packages/xserver-kdrive-common/xserver-nodm-init.bb +++ b/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 = "r9" +PR = "r10" SRC_URI = "file://xserver-nodm" S = ${WORKDIR} @@ -18,4 +18,13 @@ do_install() { inherit update-rc.d INITSCRIPT_NAME = "xserver-nodm" -INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." +# start earlier under the assumption that xserver takes seconds to start +INITSCRIPT_PARAMS = "start 5 5 2 . stop 20 0 1 6 ." + +pkg_postinst_${PN} () { +if test "x$D" = "x"; then + for f in `ls /etc/rc?.d/S99${INITSCRIPT_NAME} 2>/dev/null`; do + mv $f `dirname $f`/S05${INITSCRIPT_NAME} + done +fi +} diff --git a/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm index 2251c6aab2..28ba65cd52 100755 --- a/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm +++ b/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm @@ -19,18 +19,13 @@ done 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 - [ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root - [ -z $HOME ] && export HOME=/home/$LOGNAME - - - echo "Starting Xserver" - /etc/X11/Xserver & - fi + . /etc/profile + [ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root + [ -z $HOME ] && export HOME=/home/$LOGNAME + + + echo "Starting Xserver" + /etc/X11/Xserver & ;; stop) |