df26bfeb6a
- use update-alternatives on newer distributions (boo#1069667) - use systemd-rpm-macros (BR) - refreshed patches OBS-URL: https://build.opensuse.org/package/show/X11:lxde/lxdm?expand=0&rev=196
97 lines
2.9 KiB
Diff
97 lines
2.9 KiB
Diff
Index: lxdm-0.5.3/data/LoginReady.in
|
|
===================================================================
|
|
--- lxdm-0.5.3.orig/data/LoginReady.in
|
|
+++ lxdm-0.5.3/data/LoginReady.in
|
|
@@ -1,3 +1,2 @@
|
|
#!/bin/sh
|
|
-#
|
|
-# Note: this is a sample and will not be run as is.
|
|
+test -x /etc/X11/xdm/Xsetup && exec /etc/X11/xdm/Xsetup
|
|
Index: lxdm-0.5.3/data/PostLogout.in
|
|
===================================================================
|
|
--- lxdm-0.5.3.orig/data/PostLogout.in
|
|
+++ lxdm-0.5.3/data/PostLogout.in
|
|
@@ -1,3 +1,2 @@
|
|
#!/bin/sh
|
|
-#
|
|
-# Note: this is a sample and will not be run as is.
|
|
+test -x /etc/X11/xdm/Xreset && exec /etc/X11/xdm/Xreset
|
|
Index: lxdm-0.5.3/data/PreLogin.in
|
|
===================================================================
|
|
--- lxdm-0.5.3.orig/data/PreLogin.in
|
|
+++ lxdm-0.5.3/data/PreLogin.in
|
|
@@ -1,3 +1,2 @@
|
|
#!/bin/sh
|
|
-#
|
|
-# Note: this is a sample and will not be run as is.
|
|
+test -x /etc/X11/xdm/Xstartup && exec /etc/X11/xdm/Xstartup
|
|
Index: lxdm-0.5.3/data/Xsession
|
|
===================================================================
|
|
--- lxdm-0.5.3.orig/data/Xsession
|
|
+++ lxdm-0.5.3/data/Xsession
|
|
@@ -1,48 +1,26 @@
|
|
#!/bin/bash
|
|
|
|
-# use bash for "exec -l", howto run login shell by /bin/sh ?
|
|
+failsafe="xterm -ls -T Failsafe -geometry 80x24+0+0"
|
|
+trap "exec $failsafe" EXIT SIGHUP SIGINT SIGPIPE SIGTERM SIGIO
|
|
+shopt -s execfail
|
|
|
|
-if [ $# -eq 1 -a -n "$1" ]; then
|
|
- LXSESSION=$1
|
|
-else
|
|
# default session
|
|
- LXSESSION=/usr/bin/startlxde
|
|
-fi
|
|
+LXSESSION=/usr/bin/startlxde
|
|
+test $# -eq 1 -a -n "$1" && LXSESSION=$1
|
|
|
|
-[ -f /etc/xprofile ] && . /etc/xprofile
|
|
-[ -f ~/.xprofile ] && . ~/.xprofile
|
|
+export WINDOWMANAGER=$LXSESSION
|
|
+test -x /etc/X11/xdm/Xsession && exec /etc/X11/xdm/Xsession "${LXSESSION}"
|
|
+test -x /etc/X11/xinit/xinitrc && exec -l $SHELL -c /etc/X11/xinit/xinitrc
|
|
|
|
-if [ -f /etc/X11/xinit/xinitrc-common ]; then
|
|
-# fedora
|
|
- . /etc/X11/xinit/xinitrc-common
|
|
- exec -l bash -c "$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 bash -c /etc/X11/xinit/xinitrc
|
|
-else
|
|
# unknown, user should custom /etc/lxdm/xinitrc self
|
|
- if [ -x /etc/lxdm/xinitrc ]; then
|
|
- . /etc/lxdm/xinitrc "$LXSESSION"
|
|
- fi
|
|
- if [ -d /etc/X11/xinit/xinitrc.d ] ; then
|
|
- for f in /etc/X11/xinit/xinitrc.d/* ; do
|
|
- [ -x "$f" ] && . "$f"
|
|
- done
|
|
- unset f
|
|
- fi
|
|
-
|
|
- if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS";
|
|
- then
|
|
- eval "$(dbus-launch --sh-syntax --exit-with-session)"
|
|
- fi
|
|
+test -s /etc/lxdm/xinitrc && . /etc/lxdm/xinitrc
|
|
|
|
- exec -l bash -c "$LXSESSION"
|
|
+if ! test -z "$XDG_SESSION_COOKIE" ; then
|
|
+ CK_XINIT_SESSION=
|
|
+elif test- x /usr/bin/ck-launch-session ; then
|
|
+ CK_XINIT_SESSION="/usr/bin/ck-launch-session"
|
|
fi
|
|
+exec -l $SHELL -c "$CK_XINIT_SESSION \"$LXSESSION\""
|
|
|
|
+# failsafe
|
|
+exit 1
|