From 2dd17d48e404231c0294f8aca8e83f2f5827b6b6 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Fri, 18 May 2018 11:56:48 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 .etckeeper                             | 3 ++-
 X11/xinit/xinitrc.d/50-systemd-user.sh | 2 +-
 systemd/logind.conf                    | 1 +
 systemd/system.conf                    | 2 +-
 udev/hwdb.d/.keep_sys-apps_systemd-0   | 0
 udev/rules.d/.keep_sys-apps_systemd-0  | 0
 udev/udev.conf                         | 3 +++
 7 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 udev/hwdb.d/.keep_sys-apps_systemd-0
 create mode 100644 udev/rules.d/.keep_sys-apps_systemd-0

diff --git a/.etckeeper b/.etckeeper
index 63dadd2..e458618 100755
--- 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 4d49767..5588185 100755
--- 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 e03fbd9..d3fcf8f 100644
--- 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 6b86eac..51a6e83 100644
--- 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
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
index 0000000..e69de29
diff --git a/udev/udev.conf b/udev/udev.conf
index 47d1433..0d812d4 100644
--- 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"
-- 
2.39.5