diff options
author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-01-27 10:12:58 +0000 |
---|---|---|
committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-01-27 10:12:58 +0000 |
commit | 3f298b0d3342d1fbbbc1830528698fb4dd640d34 (patch) | |
tree | e3ed4b4b06030722ff2f0628e5af27aa7695d736 /packages/xserver-kdrive-common | |
parent | df756c10617bb375929b672e9d6a26952dbb31b9 (diff) | |
download | openembedded-3f298b0d3342d1fbbbc1830528698fb4dd640d34.tar.gz |
Revert "Merge commit 'origin/john_lee/fastboot-devel' into org.openembedded.dev"
This reverts commit 366bf6043abfbbbfa98168548f42aa9aaf6c28b9.
This did broke all image for !om-gta02. Reverted and PRs bumped.
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, 14 insertions, 18 deletions
diff --git a/packages/xserver-kdrive-common/xserver-nodm-init.bb b/packages/xserver-kdrive-common/xserver-nodm-init.bb index cba56d55a3..bea21793a6 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 = "r10" +PR = "r9" SRC_URI = "file://xserver-nodm" S = ${WORKDIR} @@ -18,13 +18,4 @@ do_install() { inherit update-rc.d INITSCRIPT_NAME = "xserver-nodm" -# 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 -} +INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ." diff --git a/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm index 28ba65cd52..2251c6aab2 100755 --- a/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm +++ b/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm @@ -19,13 +19,18 @@ 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) |