|
Lines 30-42
Link Here
|
| 30 |
sysresources=$xinitdir/.Xresources |
30 |
sysresources=$xinitdir/.Xresources |
| 31 |
sysmodmap=$xinitdir/.Xmodmap |
31 |
sysmodmap=$xinitdir/.Xmodmap |
| 32 |
|
32 |
|
|
|
33 |
# first start the presession script, so as to load things like gpg-agent |
| 34 |
[ -x /etc/X11/presession.sh ] && source /etc/X11/presession.sh |
| 35 |
|
| 33 |
# First run the system default. Because KDE uses this |
36 |
# First run the system default. Because KDE uses this |
| 34 |
# to switch sessions, we MUST first check the system |
37 |
# to switch sessions, we MUST first check the system |
| 35 |
# default, and then ~/.xsession. If the user Do not |
38 |
# default, and then ~/.xsession. If the user Do not |
| 36 |
# want this, he should override XSESSION, or at least |
39 |
# want this, he should override XSESSION, or at least |
| 37 |
# clear it. |
40 |
# clear it. |
| 38 |
if [ -n "`/etc/X11/chooser.sh`" ]; then |
41 |
if [ -n "`/etc/X11/chooser.sh`" ]; then |
| 39 |
exec "`/etc/X11/chooser.sh`" |
42 |
"`/etc/X11/chooser.sh`" |
| 40 |
# If not defined, try the user's ~/.xsession |
43 |
# If not defined, try the user's ~/.xsession |
| 41 |
elif [ -s "$startup" ]; then |
44 |
elif [ -s "$startup" ]; then |
| 42 |
|
45 |
|
|
Lines 59-73
Link Here
|
| 59 |
fi |
62 |
fi |
| 60 |
|
63 |
|
| 61 |
if [ -x "$startup" ]; then |
64 |
if [ -x "$startup" ]; then |
| 62 |
exec "$startup" |
65 |
"$startup" |
| 63 |
else |
66 |
else |
| 64 |
exec /bin/sh "$startup" |
67 |
/bin/sh "$startup" |
| 65 |
fi |
68 |
fi |
| 66 |
# Lastly, xsm as failsafe |
69 |
# Lastly, xsm as failsafe |
| 67 |
else |
70 |
else |
| 68 |
if [ -r "$userresources" ]; then |
71 |
if [ -r "$userresources" ]; then |
| 69 |
xrdb -load "$userresources" |
72 |
xrdb -load "$userresources" |
| 70 |
fi |
73 |
fi |
| 71 |
exec xsm |
74 |
xsm |
| 72 |
fi |
75 |
fi |
| 73 |
|
76 |
|
|
|
77 |
#start the postsession script |
| 78 |
[ -x /etc/X11/postsession.sh ] && source /etc/X11/postsession.sh |
