From fa6fae85eec2343350b8858fe045bcdc64a84023 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Fri, 19 Jan 2018 05:17:25 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- .etckeeper | 3 + config-archive/etc/sddm.conf | 8 +- config-archive/etc/sddm.conf.1 | 71 ++++++++------ config-archive/etc/sddm.conf.2 | 108 +++++++++++++++++++++ config-archive/etc/sddm.conf.dist.new | 129 ++++++++++++++++++++++++++ sddm.conf | 3 + sddm.conf.default | 129 ++++++++++++++++++++++++++ 7 files changed, 422 insertions(+), 29 deletions(-) create mode 100644 config-archive/etc/sddm.conf.2 create mode 100644 config-archive/etc/sddm.conf.dist.new create mode 100644 sddm.conf.default diff --git a/.etckeeper b/.etckeeper index b6156ddd..234e1766 100755 --- a/.etckeeper +++ b/.etckeeper @@ -901,7 +901,9 @@ maybe chmod 0644 'config-archive/etc/screenrc' maybe chmod 0644 'config-archive/etc/screenrc.dist' maybe chmod 0644 'config-archive/etc/sddm.conf' maybe chmod 0644 'config-archive/etc/sddm.conf.1' +maybe chmod 0644 'config-archive/etc/sddm.conf.2' maybe chmod 0644 'config-archive/etc/sddm.conf.dist' +maybe chmod 0644 'config-archive/etc/sddm.conf.dist.new' maybe chmod 0644 'config-archive/etc/sensors3.conf' maybe chmod 0644 'config-archive/etc/sensors3.conf.dist' maybe chmod 0755 'config-archive/etc/signon-ui' @@ -2562,6 +2564,7 @@ maybe chmod 0640 'sasl2/sasldb2' maybe chmod 0644 'sasl2/smtpd.conf' maybe chmod 0644 'screenrc' maybe chmod 0644 'sddm.conf' +maybe chmod 0644 'sddm.conf.default' maybe chmod 0755 'security' maybe chmod 0644 'security/access.conf' maybe chmod 0644 'security/capability.conf' diff --git a/config-archive/etc/sddm.conf b/config-archive/etc/sddm.conf index f8abb634..189f15dc 100644 --- a/config-archive/etc/sddm.conf +++ b/config-archive/etc/sddm.conf @@ -2,7 +2,7 @@ # Whether sddm should automatically log back into sessions when they exit Relogin=false -# Name of session file for autologin session +# Name of session file for autologin session (if empty try last logged in) Session= # Username for autologin session @@ -76,6 +76,9 @@ RememberLastUser=true [Wayland] +# Enable Qt's automatic high-DPI scaling +EnableHiDPI=false + # Path to a script to execute when starting the desktop session SessionCommand=/usr/share/sddm/scripts/wayland-session @@ -93,6 +96,9 @@ DisplayCommand=/usr/share/sddm/scripts/Xsetup # Path to a script to execute when stopping the display server DisplayStopCommand=/usr/share/sddm/scripts/Xstop +# Enable Qt's automatic high-DPI scaling +EnableHiDPI=false + # The lowest virtual terminal number that will be used. MinimumVT=7 diff --git a/config-archive/etc/sddm.conf.1 b/config-archive/etc/sddm.conf.1 index 404f820a..f8abb634 100644 --- a/config-archive/etc/sddm.conf.1 +++ b/config-archive/etc/sddm.conf.1 @@ -1,11 +1,11 @@ [Autologin] -# Autologin again on session exit +# Whether sddm should automatically log back into sessions when they exit Relogin=false -# Autologin session +# Name of session file for autologin session Session= -# Autologin user +# Username for autologin session User= @@ -14,9 +14,12 @@ User= #HaltCommand=/usr/bin/systemctl poweroff HaltCommand=/sbin/poweroff -# Initial NumLock state -# Valid values: on|off|none +# 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=none # Reboot command @@ -29,11 +32,19 @@ RebootCommand=/sbin/reboot #Current=maui Current=deepin -# Cursor theme +# Cursor theme used in the greeter CursorTheme= -# Face icon directory -# The files should be in username.face.icon format +# 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 @@ -41,14 +52,14 @@ ThemeDir=/usr/share/sddm/themes [Users] -# Default $PATH +# Default $PATH for logged in users DefaultPath=/bin:/usr/bin:/usr/local/bin -# Hidden shells +# Comma-separated list of shells. # Users with these shells as their default won't be listed HideShells= -# Hidden users +# Comma-separated list of users that should not be listed HideUsers= # Maximum user id for displayed users @@ -64,45 +75,49 @@ RememberLastSession=true RememberLastUser=true -[WaylandDisplay] -# Wayland session script path -# A script to execute when starting the desktop session +[Wayland] +# Path to a script to execute when starting the desktop session SessionCommand=/usr/share/sddm/scripts/wayland-session -# Session description directory +# Directory containing available Wayland sessions SessionDir=/usr/share/wayland-sessions +# Path to the user session log file +SessionLogFile=.local/share/sddm/wayland-session.log -[XDisplay] -# Xsetup script path -# A script to execute when starting the display server + +[X11] +# Path to a script to execute when starting the display server DisplayCommand=/usr/share/sddm/scripts/Xsetup -# Xstop script path -# A script to execute when stopping the display server +# Path to a script to execute when stopping the display server DisplayStopCommand=/usr/share/sddm/scripts/Xstop -# Minimum VT # The lowest virtual terminal number that will be used. MinimumVT=7 -# X server arguments +# Arguments passed to the X server invocation ServerArguments=-nolisten tcp -# X server path +# Path to X server binary ServerPath=/usr/bin/X -# Xsession script path -# A script to execute when starting the desktop session +# Path to a script to execute when starting the desktop session SessionCommand=/usr/share/sddm/scripts/Xsession -# Session description directory +# Directory containing available X sessions SessionDir=/usr/share/xsessions -# Xauth path +# 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 -# Xephyr path +# Path to Xephyr binary XephyrPath=/usr/bin/Xephyr # vim: filetype=dosini diff --git a/config-archive/etc/sddm.conf.2 b/config-archive/etc/sddm.conf.2 new file mode 100644 index 00000000..404f820a --- /dev/null +++ b/config-archive/etc/sddm.conf.2 @@ -0,0 +1,108 @@ +[Autologin] +# Autologin again on session exit +Relogin=false + +# Autologin session +Session= + +# Autologin user +User= + + +[General] +# Halt command +#HaltCommand=/usr/bin/systemctl poweroff +HaltCommand=/sbin/poweroff + +# Initial NumLock state +# Valid values: on|off|none +# If property is set to none, numlock won't be changed +Numlock=none + +# Reboot command +#RebootCommand=/usr/bin/systemctl reboot +RebootCommand=/sbin/reboot + + +[Theme] +# Current theme name +#Current=maui +Current=deepin + +# Cursor theme +CursorTheme= + +# Face icon directory +# The files should be in username.face.icon format +FacesDir=/usr/share/sddm/faces + +# Theme directory path +ThemeDir=/usr/share/sddm/themes + + +[Users] +# Default $PATH +DefaultPath=/bin:/usr/bin:/usr/local/bin + +# Hidden shells +# Users with these shells as their default won't be listed +HideShells= + +# Hidden users +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 + + +[WaylandDisplay] +# Wayland session script path +# A script to execute when starting the desktop session +SessionCommand=/usr/share/sddm/scripts/wayland-session + +# Session description directory +SessionDir=/usr/share/wayland-sessions + + +[XDisplay] +# Xsetup script path +# A script to execute when starting the display server +DisplayCommand=/usr/share/sddm/scripts/Xsetup + +# Xstop script path +# A script to execute when stopping the display server +DisplayStopCommand=/usr/share/sddm/scripts/Xstop + +# Minimum VT +# The lowest virtual terminal number that will be used. +MinimumVT=7 + +# X server arguments +ServerArguments=-nolisten tcp + +# X server path +ServerPath=/usr/bin/X + +# Xsession script path +# A script to execute when starting the desktop session +SessionCommand=/usr/share/sddm/scripts/Xsession + +# Session description directory +SessionDir=/usr/share/xsessions + +# Xauth path +XauthPath=/usr/bin/xauth + +# Xephyr path +XephyrPath=/usr/bin/Xephyr + +# vim: filetype=dosini diff --git a/config-archive/etc/sddm.conf.dist.new b/config-archive/etc/sddm.conf.dist.new new file mode 100644 index 00000000..86518a72 --- /dev/null +++ b/config-archive/etc/sddm.conf.dist.new @@ -0,0 +1,129 @@ +[Autologin] +# Whether sddm should automatically log back into sessions when they exit +Relogin=false + +# Name of session file for autologin session (if empty try last logged in) +Session= + +# Username for autologin session +User= + + +[General] +# Halt command +HaltCommand=/usr/bin/systemctl 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=none + +# Reboot command +RebootCommand=/usr/bin/systemctl reboot + + +[Theme] +# Current theme name +Current= + +# Cursor theme used in the greeter +CursorTheme= + +# 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=/usr/local/bin:/usr/bin:/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 + +# When logging in as the same user twice, restore the original session, rather than create a new one +ReuseSession=false + + +[Wayland] +# Enable Qt's automatic high-DPI scaling +EnableHiDPI=false + +# 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 + +# Enable Qt's automatic high-DPI scaling +EnableHiDPI=false + +# The lowest virtual terminal number that will be used. +MinimumVT=1 + +# 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/sddm.conf b/sddm.conf index 189f15dc..b080844c 100644 --- a/sddm.conf +++ b/sddm.conf @@ -74,6 +74,9 @@ RememberLastSession=true # Remember the last successfully logged in user RememberLastUser=true +# When logging in as the same user twice, restore the original session, rather than create a new one +ReuseSession=true + [Wayland] # Enable Qt's automatic high-DPI scaling diff --git a/sddm.conf.default b/sddm.conf.default new file mode 100644 index 00000000..86518a72 --- /dev/null +++ b/sddm.conf.default @@ -0,0 +1,129 @@ +[Autologin] +# Whether sddm should automatically log back into sessions when they exit +Relogin=false + +# Name of session file for autologin session (if empty try last logged in) +Session= + +# Username for autologin session +User= + + +[General] +# Halt command +HaltCommand=/usr/bin/systemctl 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=none + +# Reboot command +RebootCommand=/usr/bin/systemctl reboot + + +[Theme] +# Current theme name +Current= + +# Cursor theme used in the greeter +CursorTheme= + +# 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=/usr/local/bin:/usr/bin:/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 + +# When logging in as the same user twice, restore the original session, rather than create a new one +ReuseSession=false + + +[Wayland] +# Enable Qt's automatic high-DPI scaling +EnableHiDPI=false + +# 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 + +# Enable Qt's automatic high-DPI scaling +EnableHiDPI=false + +# The lowest virtual terminal number that will be used. +MinimumVT=1 + +# 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 + + -- 2.39.5