saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 63dadd20070de9b85bdcb1f46fca30e2b29ab0b0..e4586186388c2df92b83998e36cf95bcbffa127f 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -11,7 +11,6 @@ mkdir -p './security/limits.d'
 mkdir -p './security/namespace.d'
 mkdir -p './skel/.ssh'
 mkdir -p './systemtap'
-mkdir -p './udev/hwdb.d'
 maybe chmod 0755 '.'
 maybe chmod 0700 '.etckeeper'
 maybe chmod 0644 '.gitignore'
@@ -2034,7 +2033,9 @@ maybe chmod 0644 'tmpfiles.d/.keep_sys-apps_systemd-0'
 maybe chmod 0755 'udev'
 maybe chmod 0444 'udev/hwdb.bin'
 maybe chmod 0755 'udev/hwdb.d'
+maybe chmod 0644 'udev/hwdb.d/.keep_sys-apps_systemd-0'
 maybe chmod 0755 'udev/rules.d'
+maybe chmod 0644 'udev/rules.d/.keep_sys-apps_systemd-0'
 maybe chmod 0644 'udev/rules.d/60-net.rules'
 maybe chmod 0644 'udev/udev.conf'
 maybe chmod 0644 'udhcpd.conf'

diff --git a/X11/xinit/xinitrc.d/50-systemd-user.sh b/X11/xinit/xinitrc.d/50-systemd-user.sh
index 4d497672283bbf463b9a93fe2559a86f1d19b7e7..5588185c50382ae3e4f376ffb5293ec73da4a489 100755 (executable)
--- a/X11/xinit/xinitrc.d/50-systemd-user.sh
+++ b/X11/xinit/xinitrc.d/50-systemd-user.sh
@@ -2,6 +2,6 @@
 
 systemctl --user import-environment DISPLAY XAUTHORITY
 
-if which dbus-update-activation-environment >/dev/null 2>&1; then
+if command -v dbus-update-activation-environment >/dev/null 2>&1; then
         dbus-update-activation-environment DISPLAY XAUTHORITY
 fi

diff --git a/systemd/logind.conf b/systemd/logind.conf
index e03fbd9ed4b7a072da95312864e534e6980a6fd7..d3fcf8f31e57f29579d3e029a251c6c2e30473d4 100644 (file)
--- a/systemd/logind.conf
+++ b/systemd/logind.conf
@@ -22,6 +22,7 @@
 #HandleSuspendKey=suspend
 #HandleHibernateKey=hibernate
 #HandleLidSwitch=suspend
+#HandleLidSwitchExternalPower=suspend
 #HandleLidSwitchDocked=ignore
 #PowerKeyIgnoreInhibited=no
 #SuspendKeyIgnoreInhibited=no

diff --git a/systemd/system.conf b/systemd/system.conf
index 6b86eac33db0005ce6f0b64267e5da4f43be40a7..51a6e83ecf16b9ac61af7b0c66ba6319528e8a6f 100644 (file)
--- a/systemd/system.conf
+++ b/systemd/system.conf
@@ -42,7 +42,7 @@
 #DefaultIOAccounting=no
 #DefaultIPAccounting=no
 #DefaultBlockIOAccounting=no
-#DefaultMemoryAccounting=no
+#DefaultMemoryAccounting=yes
 #DefaultTasksAccounting=yes
 #DefaultTasksMax=15%
 #DefaultLimitCPU=

diff --git a/udev/hwdb.d/.keep_sys-apps_systemd-0 b/udev/hwdb.d/.keep_sys-apps_systemd-0
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/udev/rules.d/.keep_sys-apps_systemd-0 b/udev/rules.d/.keep_sys-apps_systemd-0
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/udev/udev.conf b/udev/udev.conf
index 47d14330022b022cf53cb7e9c0a7068801dc4709..0d812d4a6565309658874c8745f22975f5d0ada6 100644 (file)
--- a/udev/udev.conf
+++ b/udev/udev.conf
@@ -1,3 +1,6 @@
 # see udev.conf(5) for details
+#
+# udevd is also started in the initrd.  When this file is modified you might
+# also want to rebuild the initrd, so that it will include the modified configuration.
 
 #udev_log="info"