X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fsystem.conf;h=a3727200dfaf33ac93181db62cb23c8fbb3d4944;hb=c43b2132f37264600cc26e07c8d85dfdd6c969f0;hp=68076d9735319f53cb2ed88ee6a23c2b0218be21;hpb=a98d5d64720bdf32e3b5f72f896b583e23f730ad;p=elogind.git

diff --git a/src/core/system.conf b/src/core/system.conf
index 68076d973..a3727200d 100644
--- a/src/core/system.conf
+++ b/src/core/system.conf
@@ -5,7 +5,10 @@
 #  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 #
-# See systemd.conf(5) for details
+# You can override the directives in this file by creating files in
+# /etc/systemd/system.conf.d/*.conf.
+#
+# See systemd-system.conf(5) for details
 
 [Manager]
 #LogLevel=info
@@ -17,14 +20,24 @@
 #ShowStatus=yes
 #CrashChVT=1
 #CPUAffinity=1 2
-#DefaultControllers=cpu
-#DefaultStandardOutput=journal
-#DefaultStandardError=inherit
-#JoinControllers=cpu,cpuacct,cpuset net_cls,net_prio
+#JoinControllers=cpu,cpuacct net_cls,net_prio
 #RuntimeWatchdogSec=0
 #ShutdownWatchdogSec=10min
 #CapabilityBoundingSet=
+#SystemCallArchitectures=
 #TimerSlackNSec=
+#DefaultTimerAccuracySec=1min
+#DefaultStandardOutput=journal
+#DefaultStandardError=inherit
+#DefaultTimeoutStartSec=90s
+#DefaultTimeoutStopSec=90s
+#DefaultRestartSec=100ms
+#DefaultStartLimitInterval=10s
+#DefaultStartLimitBurst=5
+#DefaultEnvironment=
+#DefaultCPUAccounting=no
+#DefaultBlockIOAccounting=no
+#DefaultMemoryAccounting=no
 #DefaultLimitCPU=
 #DefaultLimitFSIZE=
 #DefaultLimitDATA=