X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-system.conf.xml;h=fd898f75b9e60c7a95ab5ef2258d467e9e674038;hb=46525bfc020e06609a44670f277aaf23954e7d85;hp=a67b158996c2fe85ffe3eb2aab12d02f5d5f8fe0;hpb=e9dd9f9547350c7dc0473583b5c2228dc8f0ab76;p=elogind.git
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index a67b15899..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,36 +139,11 @@
- 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
- hierarchy. By default systemd will
+ hierarchy. By default, systemd will
mount all controllers which are
enabled in the kernel in individual
hierarchies, with the exception of
@@ -154,7 +164,7 @@
necessary to rebuild the initrd if
this option is changed, and make sure
the new configuration file is included
- in it. Otherwise the initrd might
+ in it. Otherwise, the initrd might
mount the controller hierarchies in a
different configuration than intended,
and the main system cannot remount
@@ -175,7 +185,7 @@
d,
w). If
RuntimeWatchdogSec=
- is set to a non-zero value the
+ is set to a non-zero value, the
watchdog hardware
(/dev/watchdog)
will be programmed to automatically
@@ -220,7 +230,7 @@
Capabilities listed will be included
in the bounding set, all others are
removed. If the list of capabilities
- is prefixed with ~ all but the listed
+ is prefixed with ~, all but the listed
capabilities will be included, the
effect of the assignment
inverted. Note that this option also