From a0094b2754b8941829506d9fe06905794a0a9c9a Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Thu, 3 Jul 2008 10:45:44 +0000
Subject: 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
---
 meta/packages/xserver-kdrive-common/xserver-nodm-init.bb           | 2 +-
 meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'meta')

diff --git a/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb b/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb
index 99141de69..e67c4b072 100644
--- 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 6a04efe86..b518ccc1f 100755
--- 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)
-- 
cgit v1.2.3