diff options
| author | Matthew Allum <mallum@openedhand.com> | 2006-08-23 10:44:12 +0000 |
|---|---|---|
| committer | Matthew Allum <mallum@openedhand.com> | 2006-08-23 10:44:12 +0000 |
| commit | 521b22d2f817b603fa0948199624699031fcf832 (patch) | |
| tree | fcdec27c11f9e3b3bcd46d962a1315ea2afcc7cc /meta/packages/xserver-kdrive-common/xserver-nodm-init | |
| parent | 2d5a5e5ba93b6b1ce8ddf092c7d4839e525d48ff (diff) | |
| download | openembedded-core-521b22d2f817b603fa0948199624699031fcf832.tar.gz openembedded-core-521b22d2f817b603fa0948199624699031fcf832.tar.bz2 openembedded-core-521b22d2f817b603fa0948199624699031fcf832.zip | |
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
Diffstat (limited to 'meta/packages/xserver-kdrive-common/xserver-nodm-init')
| -rwxr-xr-x | meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm | 24 |
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 eeab55a71a..be405bc008 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 |