[oe-commits] Chia-I Wu : fastboot: xserver-nodm-init: Start at 05.

[GIT User account]

Module: openembedded.git
Branch: john_lee/fastboot-devel
Commit: 5fd8a892f5e9ce526072255a278eda00382020f6
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5fd8a892f5e9ce526072255a278eda00382020f6

Author: Chia-I Wu <olv at openmoko.com>
Date:   Tue Oct 28 19:17:00 2008 +0800

fastboot: xserver-nodm-init: Start at 05.

---

 .../xserver-kdrive-common/xserver-nodm-init.bb     |   13 +++++++++++--
 .../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 bea2179..cba56d5 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 2251c6a..28ba65c 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)