From c8dcffeee823616eae8c5994b1160f9a124cd6be Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 9 Jan 2018 03:46:16 +0000 Subject: x11-misc/sddm : add sys-auth/elogind support --- x11-misc/sddm/files/sddm-enable-elogind.patch | 56 +++++++++++ x11-misc/sddm/files/sddm-redcore-consolekit.conf | 114 +++++++++++++++++++++++ x11-misc/sddm/files/sddm-redcore-elogind.conf | 114 +++++++++++++++++++++++ x11-misc/sddm/files/sddm-redcore.conf | 114 ----------------------- 4 files changed, 284 insertions(+), 114 deletions(-) create mode 100644 x11-misc/sddm/files/sddm-enable-elogind.patch create mode 100644 x11-misc/sddm/files/sddm-redcore-consolekit.conf create mode 100644 x11-misc/sddm/files/sddm-redcore-elogind.conf delete mode 100644 x11-misc/sddm/files/sddm-redcore.conf (limited to 'x11-misc/sddm/files') diff --git a/x11-misc/sddm/files/sddm-enable-elogind.patch b/x11-misc/sddm/files/sddm-enable-elogind.patch new file mode 100644 index 00000000..b427ddd9 --- /dev/null +++ b/x11-misc/sddm/files/sddm-enable-elogind.patch @@ -0,0 +1,56 @@ +--- a/CMakeLists.txt 2016-11-10 09:27:03.866358608 +0100 ++++ b/CMakeLists.txt 2016-11-10 10:28:25.384374766 +0100 +@@ -93,7 +93,7 @@ + endif() + + # systemd +-if(NOT NO_SYSTEMD) ++if(NOT NO_SYSTEMD AND NOT USE_ELOGIND) + pkg_check_modules(SYSTEMD "systemd") + endif() + +@@ -127,12 +127,34 @@ + set(REBOOT_COMMAND "/usr/bin/systemctl reboot") + else() + set(SYSTEMD_FOUND 0) ++endif() ++add_feature_info("systemd" SYSTEMD_FOUND "systemd support") ++add_feature_info("journald" JOURNALD_FOUND "journald support") ++ ++# elogind ++if(NO_SYSTEMD AND USE_ELOGIND) ++ pkg_check_modules(ELOGIND "libelogind") ++endif() ++ ++if(ELOGIND_FOUND) ++ add_definitions(-DHAVE_ELOGIND) ++ set(CMAKE_AUTOMOC_MOC_OPTIONS -DHAVE_ELOGIND) ++ ++ set(MINIMUM_VT 7) ++ set(HALT_COMMAND "/bin/loginctl poweroff") ++ set(REBOOT_COMMAND "/bin/loginctl reboot") ++else() ++ set(ELOGIND_FOUND 0) ++endif() ++add_feature_info("elogind" ELOGIND_FOUND "elogind support") ++ ++# Default behaviour if neither systemd nor elogind is used ++if (NOT ELOGIND_FOUND AND NOT SYSTEMD_FOUND) + set(MINIMUM_VT 7) + set(HALT_COMMAND "/sbin/shutdown -h -P now") + set(REBOOT_COMMAND "/sbin/shutdown -r now") + endif() +-add_feature_info("systemd" SYSTEMD_FOUND "systemd support") +-add_feature_info("journald" JOURNALD_FOUND "journald support") ++ + + # Set constants + set(DATA_INSTALL_DIR "${CMAKE_INSTALL_FULL_DATADIR}/sddm" CACHE PATH "System application data install directory") +--- a/services/sddm-greeter.pam 2016-06-19 12:24:42.000000000 +0200 ++++ b/services/sddm-greeter.pam 2016-11-02 09:48:18.990032363 +0100 +@@ -14,4 +14,5 @@ + + # Setup session + session required pam_unix.so + session optional pam_systemd.so ++session optional pam_elogind.so diff --git a/x11-misc/sddm/files/sddm-redcore-consolekit.conf b/x11-misc/sddm/files/sddm-redcore-consolekit.conf new file mode 100644 index 00000000..cb4bae90 --- /dev/null +++ b/x11-misc/sddm/files/sddm-redcore-consolekit.conf @@ -0,0 +1,114 @@ +[Autologin] +# Whether sddm should automatically log back into sessions when they exit +Relogin=false + +# Name of session file for autologin session +Session= + +# Username for autologin session +User= + +[General] +# Halt command +HaltCommand=/sbin/shutdown -h -P now + +# Input method module +InputMethod= + +# Initial NumLock state. Can be on, off or none. +# If property is set to none, numlock won't be changed +# NOTE: Currently ignored if autologin is enabled. +Numlock=off + +# Reboot command +RebootCommand=/sbin/shutdown -r now + +[Theme] +# Current theme name +Current=redcore + +# Cursor theme used in the greeter +CursorTheme=Hacked-Red + +# Number of users to use as threshold +# above which avatars are disabled +# unless explicitly enabled with EnableAvatars +DisableAvatarsThreshold=7 + +# Enable display of custom user avatars +EnableAvatars=true + +# Global directory for user avatars +# The files should be named .face.icon +FacesDir=/usr/share/sddm/faces + +# Theme directory path +ThemeDir=/usr/share/sddm/themes + +[Users] +# Default $PATH for logged in users +DefaultPath=/bin:/usr/bin:/usr/local/bin + +# Comma-separated list of shells. +# Users with these shells as their default won't be listed +HideShells= + +# Comma-separated list of users that should not be listed +HideUsers= + +# Maximum user id for displayed users +MaximumUid=60000 + +# Minimum user id for displayed users +MinimumUid=1000 + +# Remember the session of the last successfully logged in user +RememberLastSession=true + +# Remember the last successfully logged in user +RememberLastUser=true + +[Wayland] +# Path to a script to execute when starting the desktop session +SessionCommand=/usr/share/sddm/scripts/wayland-session + +# Directory containing available Wayland sessions +SessionDir=/usr/share/wayland-sessions + +# Path to the user session log file +SessionLogFile=.local/share/sddm/wayland-session.log + +[X11] +# Path to a script to execute when starting the display server +DisplayCommand=/usr/share/sddm/scripts/Xsetup + +# Path to a script to execute when stopping the display server +DisplayStopCommand=/usr/share/sddm/scripts/Xstop + +# The lowest virtual terminal number that will be used. +MinimumVT=7 + +# Arguments passed to the X server invocation +ServerArguments=-nolisten tcp + +# Path to X server binary +ServerPath=/usr/bin/X + +# Path to a script to execute when starting the desktop session +SessionCommand=/usr/share/sddm/scripts/Xsession + +# Directory containing available X sessions +SessionDir=/usr/share/xsessions + +# Path to the user session log file +SessionLogFile=.local/share/sddm/xorg-session.log + +# Path to the Xauthority file +UserAuthFile=.Xauthority + +# Path to xauth binary +XauthPath=/usr/bin/xauth + +# Path to Xephyr binary +XephyrPath=/usr/bin/Xephyr + diff --git a/x11-misc/sddm/files/sddm-redcore-elogind.conf b/x11-misc/sddm/files/sddm-redcore-elogind.conf new file mode 100644 index 00000000..15721d22 --- /dev/null +++ b/x11-misc/sddm/files/sddm-redcore-elogind.conf @@ -0,0 +1,114 @@ +[Autologin] +# Whether sddm should automatically log back into sessions when they exit +Relogin=false + +# Name of session file for autologin session +Session= + +# Username for autologin session +User= + +[General] +# Halt command +HaltCommand=/bin/loginctl poweroff + +# Input method module +InputMethod= + +# Initial NumLock state. Can be on, off or none. +# If property is set to none, numlock won't be changed +# NOTE: Currently ignored if autologin is enabled. +Numlock=off + +# Reboot command +RebootCommand=/bin/loginctl reboot + +[Theme] +# Current theme name +Current=redcore + +# Cursor theme used in the greeter +CursorTheme=Hacked-Red + +# Number of users to use as threshold +# above which avatars are disabled +# unless explicitly enabled with EnableAvatars +DisableAvatarsThreshold=7 + +# Enable display of custom user avatars +EnableAvatars=true + +# Global directory for user avatars +# The files should be named .face.icon +FacesDir=/usr/share/sddm/faces + +# Theme directory path +ThemeDir=/usr/share/sddm/themes + +[Users] +# Default $PATH for logged in users +DefaultPath=/bin:/usr/bin:/usr/local/bin + +# Comma-separated list of shells. +# Users with these shells as their default won't be listed +HideShells= + +# Comma-separated list of users that should not be listed +HideUsers= + +# Maximum user id for displayed users +MaximumUid=60000 + +# Minimum user id for displayed users +MinimumUid=1000 + +# Remember the session of the last successfully logged in user +RememberLastSession=true + +# Remember the last successfully logged in user +RememberLastUser=true + +[Wayland] +# Path to a script to execute when starting the desktop session +SessionCommand=/usr/share/sddm/scripts/wayland-session + +# Directory containing available Wayland sessions +SessionDir=/usr/share/wayland-sessions + +# Path to the user session log file +SessionLogFile=.local/share/sddm/wayland-session.log + +[X11] +# Path to a script to execute when starting the display server +DisplayCommand=/usr/share/sddm/scripts/Xsetup + +# Path to a script to execute when stopping the display server +DisplayStopCommand=/usr/share/sddm/scripts/Xstop + +# The lowest virtual terminal number that will be used. +MinimumVT=7 + +# Arguments passed to the X server invocation +ServerArguments=-nolisten tcp + +# Path to X server binary +ServerPath=/usr/bin/X + +# Path to a script to execute when starting the desktop session +SessionCommand=/usr/share/sddm/scripts/Xsession + +# Directory containing available X sessions +SessionDir=/usr/share/xsessions + +# Path to the user session log file +SessionLogFile=.local/share/sddm/xorg-session.log + +# Path to the Xauthority file +UserAuthFile=.Xauthority + +# Path to xauth binary +XauthPath=/usr/bin/xauth + +# Path to Xephyr binary +XephyrPath=/usr/bin/Xephyr + diff --git a/x11-misc/sddm/files/sddm-redcore.conf b/x11-misc/sddm/files/sddm-redcore.conf deleted file mode 100644 index cb4bae90..00000000 --- a/x11-misc/sddm/files/sddm-redcore.conf +++ /dev/null @@ -1,114 +0,0 @@ -[Autologin] -# Whether sddm should automatically log back into sessions when they exit -Relogin=false - -# Name of session file for autologin session -Session= - -# Username for autologin session -User= - -[General] -# Halt command -HaltCommand=/sbin/shutdown -h -P now - -# Input method module -InputMethod= - -# Initial NumLock state. Can be on, off or none. -# If property is set to none, numlock won't be changed -# NOTE: Currently ignored if autologin is enabled. -Numlock=off - -# Reboot command -RebootCommand=/sbin/shutdown -r now - -[Theme] -# Current theme name -Current=redcore - -# Cursor theme used in the greeter -CursorTheme=Hacked-Red - -# Number of users to use as threshold -# above which avatars are disabled -# unless explicitly enabled with EnableAvatars -DisableAvatarsThreshold=7 - -# Enable display of custom user avatars -EnableAvatars=true - -# Global directory for user avatars -# The files should be named .face.icon -FacesDir=/usr/share/sddm/faces - -# Theme directory path -ThemeDir=/usr/share/sddm/themes - -[Users] -# Default $PATH for logged in users -DefaultPath=/bin:/usr/bin:/usr/local/bin - -# Comma-separated list of shells. -# Users with these shells as their default won't be listed -HideShells= - -# Comma-separated list of users that should not be listed -HideUsers= - -# Maximum user id for displayed users -MaximumUid=60000 - -# Minimum user id for displayed users -MinimumUid=1000 - -# Remember the session of the last successfully logged in user -RememberLastSession=true - -# Remember the last successfully logged in user -RememberLastUser=true - -[Wayland] -# Path to a script to execute when starting the desktop session -SessionCommand=/usr/share/sddm/scripts/wayland-session - -# Directory containing available Wayland sessions -SessionDir=/usr/share/wayland-sessions - -# Path to the user session log file -SessionLogFile=.local/share/sddm/wayland-session.log - -[X11] -# Path to a script to execute when starting the display server -DisplayCommand=/usr/share/sddm/scripts/Xsetup - -# Path to a script to execute when stopping the display server -DisplayStopCommand=/usr/share/sddm/scripts/Xstop - -# The lowest virtual terminal number that will be used. -MinimumVT=7 - -# Arguments passed to the X server invocation -ServerArguments=-nolisten tcp - -# Path to X server binary -ServerPath=/usr/bin/X - -# Path to a script to execute when starting the desktop session -SessionCommand=/usr/share/sddm/scripts/Xsession - -# Directory containing available X sessions -SessionDir=/usr/share/xsessions - -# Path to the user session log file -SessionLogFile=.local/share/sddm/xorg-session.log - -# Path to the Xauthority file -UserAuthFile=.Xauthority - -# Path to xauth binary -XauthPath=/usr/bin/xauth - -# Path to Xephyr binary -XephyrPath=/usr/bin/Xephyr - -- cgit v1.2.3