X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fsystem.conf;h=38bbca5b4160c0c898c321b7103a448bdbfaa60d;hp=d5208186a0449d5151bf5d172a9ef62ee4fd162b;hb=128c3c5881e5708b3f15517ee24dd8c0a1c6307e;hpb=d081dffbd3e57dc9da494a3384e333bf565d4175

diff --git a/src/core/system.conf b/src/core/system.conf
index d5208186a..38bbca5b4 100644
--- a/src/core/system.conf
+++ b/src/core/system.conf
@@ -5,7 +5,7 @@
 #  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
 #
-# See systemd.conf(5) for details
+# See systemd-system.conf(5) for details
 
 [Manager]
 #LogLevel=info
@@ -17,14 +17,19 @@
 #ShowStatus=yes
 #CrashChVT=1
 #CPUAffinity=1 2
-#DefaultControllers=cpu
 #DefaultStandardOutput=journal
 #DefaultStandardError=inherit
-#JoinControllers=cpu,cpuacct
+#JoinControllers=cpu,cpuacct net_cls,net_prio
 #RuntimeWatchdogSec=0
 #ShutdownWatchdogSec=10min
 #CapabilityBoundingSet=
 #TimerSlackNSec=
+#DefaultTimeoutStartSec=90s
+#DefaultTimeoutStopSec=90s
+#DefaultRestartSec=100ms
+#DefaultStartLimitInterval=10s
+#DefaultStartLimitBurst=5
+#DefaultEnvironment=
 #DefaultLimitCPU=
 #DefaultLimitFSIZE=
 #DefaultLimitDATA=