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-kdrive-common/etc/X11/Xsession | |
parent | 2d5a5e5ba93b6b1ce8ddf092c7d4839e525d48ff (diff) | |
download | poky-521b22d2f817b603fa0948199624699031fcf832.tar.gz |
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-kdrive-common/etc/X11/Xsession')
-rw-r--r-- | meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession index cfa3a9a6e3..b607462fe3 100644 --- a/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession +++ b/meta/packages/xserver-kdrive-common/xserver-kdrive-common/etc/X11/Xsession | |||
@@ -19,29 +19,9 @@ if [ -f $HOME/.profile ]; then | |||
19 | . $HOME/.profile | 19 | . $HOME/.profile |
20 | fi | 20 | fi |
21 | 21 | ||
22 | SYSSESSIONDIR=/etc/X11/Xsession-gpe.d | 22 | SYSSESSIONDIR=/etc/X11/Xsession.d |
23 | 23 | ||
24 | if [ ! -d $SYSSESSIONDIR ]; then | 24 | run-parts $SYSSESSIONDIR |
25 | SYSSESSIONDIR=/etc/X11/Xsession.d | ||
26 | fi | ||
27 | |||
28 | # Use run-parts to source every file in the session directory; we source | ||
29 | # instead of executing so that the variables and functions defined above | ||
30 | # are available to the scripts, and so that they can pass variables to each | ||
31 | # other. | ||
32 | |||
33 | # Can't use run-parts like this, busybox doesn't support it. Use ls instead | ||
34 | #SESSIONFILES=$(run-parts --list $SYSSESSIONDIR) | ||
35 | |||
36 | SESSIONFILES=`ls -X $SYSSESSIONDIR` | ||
37 | if [ -n "$SESSIONFILES" ]; then | ||
38 | for SESSIONFILE in $SESSIONFILES; do | ||
39 | # Test if script is executable first before sourcing it | ||
40 | if [ -x "$SYSSESSIONDIR/$SESSIONFILE" ]; then | ||
41 | . $SYSSESSIONDIR/$SESSIONFILE | ||
42 | fi | ||
43 | done | ||
44 | fi | ||
45 | 25 | ||
46 | exit 0 | 26 | exit 0 |
47 | 27 | ||