[oe-commits] Klaus Kurzmann : xserver-nodm-init: Start at 05.

[git version control]

Module: openembedded.git
Branch: fso/milestone5.5
Commit: 89ee5c1c2625d7a2be841737b4788687a3d6de12
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=89ee5c1c2625d7a2be841737b4788687a3d6de12

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sat Dec 13 10:48:43 2008 +0100

xserver-nodm-init: Start at 05.

Author: Chia-I Wu <olv at openmoko.com>
Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 recipes/xserver-kdrive-common/xserver-nodm-init.bb |    5 ++++-
 .../xserver-nodm-init/xserver-nodm                 |   19 +++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/recipes/xserver-kdrive-common/xserver-nodm-init.bb b/recipes/xserver-kdrive-common/xserver-nodm-init.bb
index eee2b8a..cb5a9fa 100644
--- a/recipes/xserver-kdrive-common/xserver-nodm-init.bb
+++ b/recipes/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 = "r11"
+PR = "r11.1"
 
 SRC_URI = "file://xserver-nodm"
 S = ${WORKDIR}
@@ -19,3 +19,6 @@ 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_openmoko = "start 5 5 2 . stop 20 0 1 6 ."
diff --git a/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
index 2251c6a..28ba65c 100755
--- a/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
+++ b/recipes/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)