[packages/sddm] - our Xsession script (from kdm)
arekm
arekm at pld-linux.org
Mon Sep 7 14:37:28 CEST 2015
commit c45cfca644340fd429b3d391f4db1a54e6fb8dd9
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon Sep 7 14:37:18 2015 +0200
- our Xsession script (from kdm)
Xsession | 43 +++++++++++++++++++++++++++++++++++++++++++
sddm.spec | 3 ++-
2 files changed, 45 insertions(+), 1 deletion(-)
---
diff --git a/sddm.spec b/sddm.spec
index f511b6f..eccc7f8 100644
--- a/sddm.spec
+++ b/sddm.spec
@@ -12,6 +12,7 @@ Source11: %{name}-autologin.pam
Source12: tmpfiles-%{name}.conf
# sample sddm.conf generated with sddm --example-config, and entries commented-out
Source13: %{name}.conf
+Source14: Xsession
BuildRequires: cmake
BuildRequires: libxcb-devel
BuildRequires: pam-devel
@@ -45,7 +46,6 @@ cd build
%{cmake} \
-DBUILD_MAN_PAGES:BOOL=ON \
-DENABLE_JOURNALD:BOOL=ON \
- -DSESSION_COMMAND:PATH=/etc/X11/xinit/Xsession \
-DUSE_QT5:BOOL=ON \
..
cd ..
@@ -63,6 +63,7 @@ install -Dpm 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/sddm
install -Dpm 644 %{SOURCE11} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/sddm-autologin
install -Dpm 644 %{SOURCE12} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/sddm.conf
install -Dpm 644 %{SOURCE13} $RPM_BUILD_ROOT%{_sysconfdir}/sddm.conf
+install -Dpm 644 %{SOURCE14} $RPM_BUILD_ROOT%{_datadir}/sddm/scripts/Xsession
install -d $RPM_BUILD_ROOT%{_localstatedir}/run/sddm
install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/sddm
diff --git a/Xsession b/Xsession
new file mode 100644
index 0000000..52cc604
--- /dev/null
+++ b/Xsession
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+# Make it login shell
+if [ "$HAVE_LOGIN_SHELL" != "yes" ]; then
+ export HAVE_LOGIN_SHELL=yes
+ case $SHELL in
+ */csh|*/tcsh)
+ # [t]cshrc is always sourced automatically.
+ # Note that sourcing csh.login after .cshrc is non-standard.
+ exec $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; exec $0 $*"
+ ;;
+ *)
+ exec $SHELL -l $0 $*
+ esac
+fi
+unset HAVE_LOGIN_SHELL
+
+# Call standard xinit actions
+. /etc/X11/xinit/xinitdefs
+
+case $1 in
+ failsafe)
+ exec xterm -geometry 80x24-0-0
+ ;;
+ ""|default)
+ # take default action
+ if [ -x "$HOME/.Xclients" ]; then
+ exec "$HOME/.Xclients"
+ else
+ exec /etc/X11/xinit/Xclients
+ fi
+ ;;
+ custom)
+ if [ -x "$HOME/.xsession" ]; then
+ exec "$HOME/.xsession"
+ else
+ exec xmessage -center -buttons OK:0 -default OK \
+ "Sorry, $HOME/.xsession not found."
+ fi
+ ;;
+ *)
+ exec /etc/X11/xinit/Xclients $1
+esac
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sddm.git/commitdiff/c45cfca644340fd429b3d391f4db1a54e6fb8dd9
More information about the pld-cvs-commit
mailing list