From ce271d957b870311d6a58eb12a291fb37537f95c Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Mon, 15 May 2017 11:13:14 +0200
Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run

---
 dbus-1/system.d/org.freedesktop.login1.conf   |  4 ++
 dbus-1/system.d/org.freedesktop.machine1.conf | 20 +++++++
 dbus-1/system.d/org.freedesktop.systemd1.conf | 60 +++++++++++++++++++
 pam.d/systemd-user                            |  6 +-
 systemd/logind.conf                           |  3 +
 systemd/system.conf                           | 11 +++-
 .../dbus-org.freedesktop.resolve1.service     |  1 +
 .../multi-user.target.wants/machines.target   |  1 +
 systemd/user.conf                             |  2 +-
 9 files changed, 102 insertions(+), 6 deletions(-)
 create mode 120000 systemd/system/dbus-org.freedesktop.resolve1.service
 create mode 120000 systemd/system/multi-user.target.wants/machines.target

diff --git a/dbus-1/system.d/org.freedesktop.login1.conf b/dbus-1/system.d/org.freedesktop.login1.conf
index 1662d4c..c89e404 100644
--- a/dbus-1/system.d/org.freedesktop.login1.conf
+++ b/dbus-1/system.d/org.freedesktop.login1.conf
@@ -232,6 +232,10 @@
                        send_interface="org.freedesktop.login1.Session"
                        send_member="SetIdleHint"/>
 
+                <allow send_destination="org.freedesktop.login1"
+                       send_interface="org.freedesktop.login1.Session"
+                       send_member="SetLockedHint"/>
+
                 <allow send_destination="org.freedesktop.login1"
                        send_interface="org.freedesktop.login1.Session"
                        send_member="Kill"/>
diff --git a/dbus-1/system.d/org.freedesktop.machine1.conf b/dbus-1/system.d/org.freedesktop.machine1.conf
index 9d40b90..daa365a 100644
--- a/dbus-1/system.d/org.freedesktop.machine1.conf
+++ b/dbus-1/system.d/org.freedesktop.machine1.conf
@@ -64,6 +64,10 @@
                        send_interface="org.freedesktop.machine1.Manager"
                        send_member="GetMachineOSRelease"/>
 
+                <allow send_destination="org.freedesktop.machine1"
+                       send_interface="org.freedesktop.machine1.Manager"
+                       send_member="GetMachineUIDShift"/>
+
                 <allow send_destination="org.freedesktop.machine1"
                        send_interface="org.freedesktop.machine1.Manager"
                        send_member="OpenMachineLogin"/>
@@ -116,6 +120,14 @@
                        send_interface="org.freedesktop.machine1.Manager"
                        send_member="SetImageLimit"/>
 
+                <allow send_destination="org.freedesktop.machine1"
+                       send_interface="org.freedesktop.machine1.Manager"
+                       send_member="GetImageOSRelease"/>
+
+                <allow send_destination="org.freedesktop.machine1"
+                       send_interface="org.freedesktop.machine1.Manager"
+                       send_member="CleanPool"/>
+
                 <allow send_destination="org.freedesktop.machine1"
                        send_interface="org.freedesktop.machine1.Manager"
                        send_member="MapFromMachineUser"/>
@@ -140,6 +152,10 @@
                        send_interface="org.freedesktop.machine1.Machine"
                        send_member="GetOSRelease"/>
 
+                <allow send_destination="org.freedesktop.machine1"
+                       send_interface="org.freedesktop.machine1.Machine"
+                       send_member="GetUIDShift"/>
+
                 <allow send_destination="org.freedesktop.machine1"
                        send_interface="org.freedesktop.machine1.Machine"
                        send_member="OpenLogin"/>
@@ -188,6 +204,10 @@
                        send_interface="org.freedesktop.machine1.Image"
                        send_member="MarkReadOnly"/>
 
+                <allow send_destination="org.freedesktop.machine1"
+                       send_interface="org.freedesktop.machine1.Image"
+                       send_member="GetOSRelease"/>
+
                 <allow receive_sender="org.freedesktop.machine1"/>
         </policy>
 
diff --git a/dbus-1/system.d/org.freedesktop.systemd1.conf b/dbus-1/system.d/org.freedesktop.systemd1.conf
index 6a7a37e..e824a22 100644
--- a/dbus-1/system.d/org.freedesktop.systemd1.conf
+++ b/dbus-1/system.d/org.freedesktop.systemd1.conf
@@ -52,6 +52,10 @@
                        send_interface="org.freedesktop.systemd1.Manager"
                        send_member="GetUnitByPID"/>
 
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="GetUnitByInvocationID"/>
+
                 <allow send_destination="org.freedesktop.systemd1"
                        send_interface="org.freedesktop.systemd1.Manager"
                        send_member="LoadUnit"/>
@@ -60,6 +64,14 @@
                        send_interface="org.freedesktop.systemd1.Manager"
                        send_member="GetJob"/>
 
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="GetJobAfter"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="GetJobBefore"/>
+
                 <allow send_destination="org.freedesktop.systemd1"
                        send_interface="org.freedesktop.systemd1.Manager"
                        send_member="ListUnits"/>
@@ -68,14 +80,30 @@
                        send_interface="org.freedesktop.systemd1.Manager"
                        send_member="ListUnitsFiltered"/>
 
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="ListUnitsByPatterns"/>
+
                 <allow send_destination="org.freedesktop.systemd1"
                        send_interface="org.freedesktop.systemd1.Manager"
                        send_member="ListUnitFiles"/>
 
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="ListUnitFilesByPatterns"/>
+
                 <allow send_destination="org.freedesktop.systemd1"
                        send_interface="org.freedesktop.systemd1.Manager"
                        send_member="GetUnitFileState"/>
 
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="GetUnitProcesses"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="GetUnitFileLinks"/>
+
                 <allow send_destination="org.freedesktop.systemd1"
                        send_interface="org.freedesktop.systemd1.Manager"
                        send_member="ListJobs"/>
@@ -96,6 +124,14 @@
                        send_interface="org.freedesktop.systemd1.Manager"
                        send_member="GetDefaultTarget"/>
 
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="LookupDynamicUserByName"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="LookupDynamicUserByUID"/>
+
                 <!-- Managed via polkit or other criteria -->
 
                 <allow send_destination="org.freedesktop.systemd1"
@@ -142,6 +178,10 @@
                        send_interface="org.freedesktop.systemd1.Manager"
                        send_member="SetUnitProperties"/>
 
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="ListUnitsByNames"/>
+
                 <allow send_destination="org.freedesktop.systemd1"
                        send_interface="org.freedesktop.systemd1.Manager"
                        send_member="StartTransientUnit"/>
@@ -158,6 +198,14 @@
                        send_interface="org.freedesktop.systemd1.Manager"
                        send_member="Reexecute"/>
 
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="RefUnit"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="UnrefUnit"/>
+
                 <allow send_destination="org.freedesktop.systemd1"
                        send_interface="org.freedesktop.systemd1.Manager"
                        send_member="EnableUnitFiles"/>
@@ -174,6 +222,10 @@
                        send_interface="org.freedesktop.systemd1.Manager"
                        send_member="LinkUnitFiles"/>
 
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Manager"
+                       send_member="RevertUnitFiles"/>
+
                 <allow send_destination="org.freedesktop.systemd1"
                        send_interface="org.freedesktop.systemd1.Manager"
                        send_member="PresetUnitFiles"/>
@@ -206,6 +258,14 @@
                        send_interface="org.freedesktop.systemd1.Job"
                        send_member="Cancel"/>
 
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Job"
+                       send_member="GetAfter"/>
+
+                <allow send_destination="org.freedesktop.systemd1"
+                       send_interface="org.freedesktop.systemd1.Job"
+                       send_member="GetBefore"/>
+
                 <allow receive_sender="org.freedesktop.systemd1"/>
         </policy>
 
diff --git a/pam.d/systemd-user b/pam.d/systemd-user
index 8112d74..6e412c4 100644
--- a/pam.d/systemd-user
+++ b/pam.d/systemd-user
@@ -2,5 +2,7 @@
 #
 # Used by systemd --user instances.
 
-account  include system-auth
-session  include system-auth
+account include system-auth
+session include system-auth
+session optional pam_keyinit.so force revoke
+session optional pam_systemd.so
diff --git a/systemd/logind.conf b/systemd/logind.conf
index 6df6f04..e03fbd9 100644
--- a/systemd/logind.conf
+++ b/systemd/logind.conf
@@ -32,3 +32,6 @@
 #IdleActionSec=30min
 #RuntimeDirectorySize=10%
 #RemoveIPC=yes
+#InhibitorsMax=8192
+#SessionsMax=8192
+#UserTasksMax=33%
diff --git a/systemd/system.conf b/systemd/system.conf
index 2316090..746572b 100644
--- a/systemd/system.conf
+++ b/systemd/system.conf
@@ -17,9 +17,11 @@
 #LogColor=yes
 #LogLocation=no
 #DumpCore=yes
-#CrashShell=no
 #ShowStatus=yes
-#CrashChVT=1
+#CrashChangeVT=no
+#CrashShell=no
+#CrashReboot=no
+#CtrlAltDelBurstAction=reboot-force
 #CPUAffinity=1 2
 #JoinControllers=cpu,cpuacct net_cls,net_prio
 #RuntimeWatchdogSec=0
@@ -33,12 +35,15 @@
 #DefaultTimeoutStartSec=90s
 #DefaultTimeoutStopSec=90s
 #DefaultRestartSec=100ms
-#DefaultStartLimitInterval=10s
+#DefaultStartLimitIntervalSec=10s
 #DefaultStartLimitBurst=5
 #DefaultEnvironment=
 #DefaultCPUAccounting=no
+#DefaultIOAccounting=no
 #DefaultBlockIOAccounting=no
 #DefaultMemoryAccounting=no
+#DefaultTasksAccounting=yes
+#DefaultTasksMax=15%
 #DefaultLimitCPU=
 #DefaultLimitFSIZE=
 #DefaultLimitDATA=
diff --git a/systemd/system/dbus-org.freedesktop.resolve1.service b/systemd/system/dbus-org.freedesktop.resolve1.service
new file mode 120000
index 0000000..78d4ac0
--- /dev/null
+++ b/systemd/system/dbus-org.freedesktop.resolve1.service
@@ -0,0 +1 @@
+../../../usr/lib/systemd/system/systemd-resolved.service
\ No newline at end of file
diff --git a/systemd/system/multi-user.target.wants/machines.target b/systemd/system/multi-user.target.wants/machines.target
new file mode 120000
index 0000000..1c13367
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/machines.target
@@ -0,0 +1 @@
+../../../../usr/lib/systemd/system/machines.target
\ No newline at end of file
diff --git a/systemd/user.conf b/systemd/user.conf
index 87c8164..b427f1e 100644
--- a/systemd/user.conf
+++ b/systemd/user.conf
@@ -23,7 +23,7 @@
 #DefaultTimeoutStartSec=90s
 #DefaultTimeoutStopSec=90s
 #DefaultRestartSec=100ms
-#DefaultStartLimitInterval=10s
+#DefaultStartLimitIntervalSec=10s
 #DefaultStartLimitBurst=5
 #DefaultEnvironment=
 #DefaultLimitCPU=
-- 
2.39.5