X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fsystem.conf;h=3c6cc0349bff4a8710fabfb42f72a859ab218b1f;hp=f2817bc507122eab0544c20ff31f400b9c003101;hb=175a3d25d0e8596d4ba0759aea3f89ee228e7d6d;hpb=97d0e5f83ba4dd713170f802b90149b7325bc992

diff --git a/src/core/system.conf b/src/core/system.conf
index f2817bc50..3c6cc0349 100644
--- a/src/core/system.conf
+++ b/src/core/system.conf
@@ -17,14 +17,16 @@
 #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=
 #TimerSlackNSec=
+#DefaultTimeoutStartSec=90s
+#DefaultTimeoutStopSec=90s
+#DefaultRestartSec=100ms
 #DefaultEnvironment=
 #DefaultLimitCPU=
 #DefaultLimitFSIZE=