saving uncommitted changes in /etc prior to emerge run

diff --git a/config-archive/etc/sddm.conf b/config-archive/etc/sddm.conf
index 404f820a0a543160cb26ec886033cd717bc074c8..f8abb63432a812acc60775eddc9c8f7c6f50153c 100644 (file)
--- a/config-archive/etc/sddm.conf
+++ b/config-archive/etc/sddm.conf
@@ -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 <username>.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.1 b/config-archive/etc/sddm.conf.1
new file mode 100644 (file)
index 0000000..404f820
--- /dev/null
+++ b/config-archive/etc/sddm.conf.1
@@ -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 b/config-archive/etc/sddm.conf.dist
index 626f66697b40205ee0a12e6881d06d0b0e56f963..8ee5eb664808e9903c9e3220fad12197a56bb2db 100644 (file)
--- a/config-archive/etc/sddm.conf.dist
+++ b/config-archive/etc/sddm.conf.dist
@@ -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
@@ -73,6 +73,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
 
@@ -90,8 +93,11 @@ 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
+MinimumVT=7
 
 # Arguments passed to the X server invocation
 ServerArguments=-nolisten tcp

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index a61461efbdbb11c344bf237eea87bdaffaaa1078..abeb85e44ba6202f4efc31938e0bef820b78744e 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,20 +1,12 @@
 # Subscription configuration file for CUPS v2.1.4
-# Written by cupsd on 2017-10-22 12:42
+# Written by cupsd on 2017-10-23 12:46
 NextSubscriptionId 517
-<Subscription 515>
-Events printer-changed
-Owner root
-LeaseDuration 86400
-Interval 60
-ExpirationTime 1508755324
-NextEventId 1
-</Subscription>
 <Subscription 516>
 Events all
 Owner anonymous
 Recipient dbus://
 LeaseDuration 86400
 Interval 0
-ExpirationTime 1508755325
+ExpirationTime 1508841666
 NextEventId 1
 </Subscription>

diff --git a/sddm.conf b/sddm.conf
index f8abb63432a812acc60775eddc9c8f7c6f50153c..189f15dc1f522f4c5f66f5c2f5104982cea0c702 100644 (file)
--- a/sddm.conf
+++ b/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