--- lxdm-0.4.1.orig/data/Xsession 2011-11-16 22:27:33.621019188 +0100 +++ lxdm-0.4.1/data/Xsession 2011-11-17 20:20:24.011703381 +0100 @@ -12,35 +12,12 @@ [ -f /etc/xprofile ] && . /etc/xprofile [ -f ~/.xprofile ] && . ~/.xprofile -if [ -f /etc/X11/xinit/xinitrc-common ]; then -# fedora - . /etc/X11/xinit/xinitrc-common - if ! [ -z "$XDG_SESSION_COOKIE" ]; then - CK_XINIT_SESSION= - elif [ -x /usr/bin/ck-launch-session -a -z "$CK_XINIT_SESSION" ]; then - CK_XINIT_SESSION="/usr/bin/ck-launch-session" - fi - exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\"" -elif [ -x /etc/X11/xinit/Xsession ]; then -# fedora - exec /etc/X11/xinit/Xsession "$LXSESSION" -elif [ -x /etc/X11/Xsession ]; then -# mandriva, debian, ubuntu - exec /etc/X11/Xsession "$LXSESSION" -elif [ -x /etc/X11/xinit/xinitrc ]; then -#suse - export WINDOWMANAGER=$LXSESSION - exec -l $SHELL -c /etc/X11/xinit/xinitrc -else -# unknown, user should custom /etc/lxdm/xinitrc self - if [ -x /etc/lxdm/xinitrc ]; then - . /etc/lxdm/xinitrc - fi - if ! [ -z "$XDG_SESSION_COOKIE" ]; then - CK_XINIT_SESSION= - elif [ -x /usr/bin/ck-launch-session ]; then - CK_XINIT_SESSION="/usr/bin/ck-launch-session" - fi - exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\"" +if [ -x /etc/lxdm/xinitrc ]; then + . /etc/lxdm/xinitrc fi - +if ! [ -z "$XDG_SESSION_COOKIE" ]; then + CK_XINIT_SESSION= +elif [ -x /usr/bin/ck-launch-session ]; then + CK_XINIT_SESSION="/usr/bin/ck-launch-session" +fi +exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\""