Clean up X start up scripts. Remove uneeded files. Use xinit to more safely launch Xserver and XSession scripts

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

1 files changed, 8 insertions, 16 deletions

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 eeab55a71..be405bc00 100755
--- a/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
+++ b/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
@@ -8,8 +8,6 @@ killproc() {            # kill the named process(es)
         [ "$pid" != "" ] && kill $pid
 }
 
-
-
 case "$1" in
   start)
     # We don't want this script to block the rest of the boot process
@@ -20,28 +18,22 @@ case "$1" in
 
        echo "Starting Xserver"
        /etc/X11/Xserver &
-       
-       export DISPLAY=:0
-	       
-       while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ]
-       do
-               /usr/bin/xtscal
-       done
-
-       /etc/X11/Xsession &
     fi 
   ;;
 
   stop)
         echo "Stopping XServer"
-        killproc Xfbdev
-	killproc Xomap
-	killproc Xorg
-	killproc Xepson
+        killproc xinit
+  ;;
+
+  restart)
+	$0 stop
+        sleep 1
+        $0 start
   ;;
 
   *)
-        echo "usage: $0 { start | stop }"
+        echo "usage: $0 { start | stop | restart }"
   ;;
 esac