xserver-nodm: do not run itself in background

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4792 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb b/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb
index 99141de69446f3fb83830dd032c2015d6acbe087..e67c4b072a015a1c9274bdfbd77b86b9b76dd0a0 100644 (file)
--- a/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb
+++ b/meta/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 = "r11"
 
 SRC_URI = "file://xserver-nodm"
 S = ${WORKDIR}

diff --git a/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
index 6a04efe860f83d731bf496da6000f31fcea93705..b518ccc1f1126753be6ed8b3ce8de1d07393addb 100755 (executable)
--- a/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
+++ b/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
@@ -16,15 +16,9 @@ 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
-
        echo "Starting Xserver"
        /etc/X11/Xserver &
-    fi 
   ;;
 
   stop)