[packages/sddm] - session startup updates, rel 2
baggins
baggins at pld-linux.org
Mon Sep 23 01:03:48 CEST 2024
commit cd7ef154ea912cb8b0fa642e55b4d10b68077d51
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Sep 23 01:01:16 2024 +0200
- session startup updates, rel 2
- use system-wide xinitrc script for X11 sessions
- use upstream waylad startup script, but always load profile
- don't create display-manager systemd service to avoid conflict with prefdm
Xsession | 43 ------------------------------------------
always-load-profile.patch | 21 +++++++++++++++++++++
no-display-manager-alias.patch | 10 ++++++++++
wayland-session | 6 ------
4 files changed, 31 insertions(+), 49 deletions(-)
---
diff --git a/Xsession b/Xsession
deleted file mode 100644
index 52cc604..0000000
--- a/Xsession
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/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
diff --git a/always-load-profile.patch b/always-load-profile.patch
new file mode 100644
index 0000000..a1bf6b4
--- /dev/null
+++ b/always-load-profile.patch
@@ -0,0 +1,21 @@
+--- sddm-0.21.0/data/scripts/wayland-session~ 2024-02-26 11:23:03.000000000 +0100
++++ sddm-0.21.0/data/scripts/wayland-session 2024-09-22 00:54:28.530781284 +0200
+@@ -10,6 +10,9 @@
+ # Backup the user shell setting into SDDM specific variable
+ SDDM_USER_SHELL=$SHELL
+
++[ -f /etc/profile ] && . /etc/profile
++[ -f $HOME/.profile ] && . $HOME/.profile
++
+ case $SHELL in
+ */bash)
+ [ -z "$BASH" ] && exec $SHELL --login $0 "$@"
+@@ -38,8 +41,6 @@
+ rm -f $xsess_tmp
+ ;;
+ *) # Plain sh, ksh, and anything we do not know.
+- [ -f /etc/profile ] && . /etc/profile
+- [ -f $HOME/.profile ] && . $HOME/.profile
+ ;;
+ esac
+
diff --git a/no-display-manager-alias.patch b/no-display-manager-alias.patch
new file mode 100644
index 0000000..c7d62bd
--- /dev/null
+++ b/no-display-manager-alias.patch
@@ -0,0 +1,10 @@
+--- sddm-0.21.0/services/sddm.service.in~ 2024-02-26 11:23:03.000000000 +0100
++++ sddm-0.21.0/services/sddm.service.in 2024-09-22 00:57:29.364482699 +0200
+@@ -10,7 +10,3 @@
+ [Service]
+ ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm
+ Restart=always
+-
+-[Install]
+-Alias=display-manager.service
+-
diff --git a/wayland-session b/wayland-session
deleted file mode 100755
index 547a3cb..0000000
--- a/wayland-session
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-[ -f /etc/profile ] && . /etc/profile
-[ -f "$HOME/.profile" ] && . "$HOME/.profile"
-
-exec "$@"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sddm.git/commitdiff/cd7ef154ea912cb8b0fa642e55b4d10b68077d51
More information about the pld-cvs-commit
mailing list