X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-system.conf.xml;h=fd898f75b9e60c7a95ab5ef2258d467e9e674038;hb=eda4b58b50509dc8ad0428a46e20f6c5cf516d58;hp=c52e59096ace7ec28f5668a8711ccef165fa1bd9;hpb=79640424059328268b9fb6c5fa8eb777b27a177e;p=elogind.git
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index c52e59096..fd898f75b 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -61,7 +61,6 @@
otherwise user.conf. These
configuration files contain a few settings controlling
basic manager operations.
-
@@ -94,6 +93,42 @@
arguments.
+
+ DefaultTimeoutStartSec=
+ DefaultTimeoutStopSec=
+ DefaultRestartSec=
+
+ Configures the default
+ time-outs for starting and stopping of
+ units, as well as the default time to
+ sleep between automatic restarts of
+ units, as configured per-unit in
+ TimeoutStartSec=,
+ TimeoutStopSec= and
+ RestartSec= (for
+ service units, see
+ systemd.service5
+ for details on the per-unit
+ settings). For non-service units,
+ DefaultTimeoutStartSec=
+ sets the default
+ TimeoutSec= value.
+
+
+
+ DefaultStartLimitInterval=
+ DefaultStartLimitBurst=
+
+ Configure the default start rate
+ limiting, as configured per-service by
+ StartLimitInterval= and
+ StartLimitBurst=. See
+ systemd.service5
+ for details on the per-service
+ settings).
+
+
+
CPUAffinity=
@@ -104,32 +139,7 @@
- DefaultControllers=cpu
-
- Configures in which
- control group hierarchies to create
- per-service cgroups automatically, in
- addition to the
- name=systemd named
- hierarchy. Defaults to
- cpu. Takes a
- space-separated list of controller
- names. Pass the empty string to ensure
- that systemd does not touch any
- hierarchies but its own.
-
- Note that the default value of
- 'cpu' will make realtime scheduling
- unavailable to system services. See
- My
- Service Can't Get Realtime!
- for more
- information.
-
-
-
- JoinControllers=cpu,cpuacct,cpuset net_cls,netprio
+ JoinControllers=cpu,cpuacct net_cls,netprio
Configures controllers
that shall be mounted in a single