--- xfree-old/files/4.3.0/Xsession 2003-02-28 05:28:29.000000000 +0100 +++ xfree/files/4.3.0/Xsession 2003-04-09 13:17:26.000000000 +0200 @@ -30,13 +30,16 @@ sysresources=$xinitdir/.Xresources sysmodmap=$xinitdir/.Xmodmap +# first start the presession script, so as to load things like gpg-agent +[ -x /etc/X11/presession.sh ] && source /etc/X11/presession.sh + # First run the system default. Because KDE uses this # to switch sessions, we MUST first check the system # default, and then ~/.xsession. If the user Do not # want this, he should override XSESSION, or at least # clear it. if [ -n "`/etc/X11/chooser.sh`" ]; then - exec "`/etc/X11/chooser.sh`" + "`/etc/X11/chooser.sh`" # If not defined, try the user's ~/.xsession elif [ -s "$startup" ]; then @@ -59,15 +62,17 @@ fi if [ -x "$startup" ]; then - exec "$startup" + "$startup" else - exec /bin/sh "$startup" + /bin/sh "$startup" fi # Lastly, xsm as failsafe else if [ -r "$userresources" ]; then xrdb -load "$userresources" fi - exec xsm + xsm fi +#start the postsession script +[ -x /etc/X11/postsession.sh ] && source /etc/X11/postsession.sh