X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-system.conf.xml;h=fd898f75b9e60c7a95ab5ef2258d467e9e674038;hb=49e6fdbf14b35d8840c3b263fd15259624b07818;hp=48d02269cc404b6e54b6985f0e3528d19bf2338b;hpb=78894537e047690f074c5067989517acc1b3c40e;p=elogind.git
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 48d02269c..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,42 +139,17 @@
- 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
those listed in this setting. Takes a
- space separated list of comma
- separated controller names, in order
+ space-separated list of comma-separated
+ controller names, in order
to allow multiple joined
hierarchies. Defaults to
'cpu,cpuacct'. Pass an empty string to
@@ -150,11 +160,11 @@
Note that this option is only
applied once, at very early boot. If
you use an initial RAM disk (initrd)
- that uses systemd it might hence be
+ that uses systemd, it might hence be
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
@@ -214,14 +224,13 @@
capability bounding set for PID 1 and
its children. See
capabilities7
- for details. Takes a whitespace
- separated list of capability names as
- read by
+ for details. Takes a whitespace-separated
+ list of capability names as read by
cap_from_name3.
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