blob: e4e420772d5e2227b5bdeb983a71159151795dbe (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
--- 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\""
|
