diff options
Diffstat (limited to 'system/lxdm/patches')
| -rw-r--r-- | system/lxdm/patches/lxdm-set_DESKTOP_SESSION_in_env.diff | 8 | ||||
| -rw-r--r-- | system/lxdm/patches/remove_suse_from_Xsession.diff | 10 | ||||
| -rw-r--r-- | system/lxdm/patches/source_profile_in_Xsession.diff | 25 |
3 files changed, 19 insertions, 24 deletions
diff --git a/system/lxdm/patches/lxdm-set_DESKTOP_SESSION_in_env.diff b/system/lxdm/patches/lxdm-set_DESKTOP_SESSION_in_env.diff index 6563354a68..e19acd3579 100644 --- a/system/lxdm/patches/lxdm-set_DESKTOP_SESSION_in_env.diff +++ b/system/lxdm/patches/lxdm-set_DESKTOP_SESSION_in_env.diff @@ -1,7 +1,7 @@ -diff -Naur lxdm-20120419_2ce143c.orig/src/lxdm.c lxdm-20120419_2ce143c/src/lxdm.c ---- lxdm-20120419_2ce143c.orig/src/lxdm.c 2012-04-19 16:31:16.000000000 +0200 -+++ lxdm-20120419_2ce143c/src/lxdm.c 2012-04-28 18:17:25.186023147 +0200 -@@ -1490,6 +1490,10 @@ +diff -Naur lxdm-20131220_68eacbd.orig/src/lxdm.c lxdm-20131220_68eacbd/src/lxdm.c +--- lxdm-20131220_68eacbd.orig/src/lxdm.c 2013-12-20 02:30:50.000000000 +0100 ++++ lxdm-20131220_68eacbd/src/lxdm.c 2013-12-30 17:59:04.445723000 +0100 +@@ -1296,6 +1296,10 @@ NULL)) { setenv("XDG_SESSION_COOKIE", ck_connector_get_cookie(s->ckc), 1); diff --git a/system/lxdm/patches/remove_suse_from_Xsession.diff b/system/lxdm/patches/remove_suse_from_Xsession.diff index 475c5c75a9..8e25dbc17b 100644 --- a/system/lxdm/patches/remove_suse_from_Xsession.diff +++ b/system/lxdm/patches/remove_suse_from_Xsession.diff @@ -1,14 +1,14 @@ -diff -Naur lxdm-0.4.0.orig/data/Xsession lxdm-0.4.0/data/Xsession ---- lxdm-0.4.0.orig/data/Xsession 2011-03-17 16:35:47.000000000 +0100 -+++ lxdm-0.4.0/data/Xsession 2011-07-22 17:23:49.000000000 +0200 -@@ -27,10 +27,6 @@ +diff -Naur lxdm-20131220_68eacbd.orig/data/Xsession lxdm-20131220_68eacbd/data/Xsession +--- lxdm-20131220_68eacbd.orig/data/Xsession 2013-12-20 02:30:50.000000000 +0100 ++++ lxdm-20131220_68eacbd/data/Xsession 2013-12-30 17:51:29.545723000 +0100 +@@ -22,10 +22,6 @@ 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 +- exec -l bash -c /etc/X11/xinit/xinitrc else # unknown, user should custom /etc/lxdm/xinitrc self if [ -x /etc/lxdm/xinitrc ]; then diff --git a/system/lxdm/patches/source_profile_in_Xsession.diff b/system/lxdm/patches/source_profile_in_Xsession.diff index 8f19e31284..8d04af8f7c 100644 --- a/system/lxdm/patches/source_profile_in_Xsession.diff +++ b/system/lxdm/patches/source_profile_in_Xsession.diff @@ -1,17 +1,12 @@ -diff -Nur lxdm-0.2.0.orig//data/Xsession lxdm-0.2.0/data/Xsession ---- lxdm-0.2.0.orig//data/Xsession 2010-04-12 11:49:44.000000000 -0500 -+++ lxdm-0.2.0/data/Xsession 2010-06-26 04:55:43.301983179 -0500 -@@ -2,6 +2,13 @@ +diff -Naur lxdm-20131220_68eacbd.orig/data/Xsession lxdm-20131220_68eacbd/data/Xsession +--- lxdm-20131220_68eacbd.orig/data/Xsession 2013-12-20 02:30:50.000000000 +0100 ++++ lxdm-20131220_68eacbd/data/Xsession 2013-12-30 17:48:52.110723000 +0100 +@@ -9,6 +9,8 @@ + LXSESSION=/usr/bin/startlxde + fi - # use bash for "exec -l", howto run login shell by /bin/sh ? ++[ -f /etc/profile ] && . /etc/profile ++[ -f ~/.profile ] && . ~/.profile + [ -f /etc/xprofile ] && . /etc/xprofile + [ -f ~/.xprofile ] && . ~/.xprofile -+# First read /etc/profile and .profile -+test -f /etc/profile && . /etc/profile -+test -f "$HOME/.profile" && . "$HOME/.profile" -+# Second read /etc/xprofile and .xprofile for X specific setup -+test -f /etc/xprofile && . /etc/xprofile -+test -f "$HOME/.xprofile" && . "$HOME/.xprofile" -+ - if [ $# -eq 1 -a -n "$1" ]; then - LXSESSION=$1 - else |