X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=man%2Fsystemd-system.conf.xml;h=1fad1dba80191e47556b97f7c1a5c605dd51e46d;hp=c33e010e36e00afb3efc33949c4ad5565b9dc2bc;hb=c2fa048c4a70c8386c6d8fe939e5ea9edecf1e98;hpb=d3b1c5083359faa6cfca81810cf87ef70d0290f6
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index c33e010e3..1fad1dba8 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -99,7 +99,7 @@
Configures the initial
CPU affinity for the init
process. Takes a space-separated list
- of CPU indexes.
+ of CPU indices.
@@ -187,7 +187,7 @@
capabilities to include in the
capability bounding set for PID 1 and
its children. See
- capabilities7
+ capabilities7
for details. Takes a whitespace-separated
list of capability names as read by
cap_from_name3.
@@ -216,21 +216,21 @@
Takes a
space-separated list of architecture
- identifiers. Selects of which
+ identifiers. Selects from which
architectures system calls may be
invoked on this system. This may be
used as an effective way to disable
invocation of non-native binaries
system-wide, for example to prohibit
- execution of 32bit x86 binaries on
- 64bit x86-64 systems. This option
- operates system wide, and acts
+ execution of 32-bit x86 binaries on
+ 64-bit x86-64 systems. This option
+ operates system-wide, and acts
similar to the
SystemCallArchitectures=
setting of unit files, see
systemd.exec5
for details. This setting defaults to
- the empty list in which case no
+ the empty list, in which case no
filtering of system calls based on
architecture is applied. Known
architecture identifiers are
@@ -249,18 +249,17 @@
execution of any non-native
binaries. When a binary executes a
system call of an architecture that is
- not listed in this setting it will be
+ not listed in this setting, it will be
immediately terminated with the SIGSYS
signal.
-
TimerSlackNSec=Sets the timer slack
- in nanoseconds for PID 1 which is then
- inherited to all executed processes,
+ in nanoseconds for PID 1, which is
+ inherited by all executed processes,
unless overridden individually, for
example with the
TimerSlackNSec=
@@ -268,7 +267,8 @@
see
systemd.exec5). The
timer slack controls the accuracy of
- wake-ups triggered by timers. See
+ wake-ups triggered by system
+ timers. See
prctl2
for more information. Note that in
contrast to most other time span
@@ -279,20 +279,67 @@
too.
+
+ StartTimeoutSec=
+ StartTimeoutAction=
+ StartTimeoutRebootArgument=
+
+ Configures an over-all
+ system start-up timeout and controls
+ what to do when the timeout is
+ reached. StartTimeoutSec=
+ specifies the timeout, and defaults to
+ 15min. StartTimeoutAction=
+ configures the action to take when the
+ system did not finish boot-up within
+ the specified time. It takes the same
+ values as the per-service
+ StartLimitAction=
+ setting, see
+ systemd.service5
+ for details. Defaults to
+ . StartTimeoutRebootArgument=
+ configures an optional reboot string
+ to pass to the
+ reboot2
+ system call.
+
+
+
+ DefaultTimerAccuracySec=
+
+ Sets the default
+ accuracy of timer units. This controls
+ the global default for the
+ AccuracySec=
+ setting of timer units, see
+ systemd.timer5
+ for
+ details. AccuracySec=
+ set in individual units override the
+ global default for the specific
+ unit. Defaults to 1min. Note that the
+ accuracy of timer units is also
+ affected by the configured timer slack
+ for PID 1, see
+ TimerSlackNSec=
+ above.
+
+
DefaultTimeoutStartSec=DefaultTimeoutStopSec=DefaultRestartSec=Configures the default
- time-outs for starting and stopping of
+ timeouts 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
+ services, see
systemd.service5
for details on the per-unit
settings). For non-service units,
@@ -301,18 +348,20 @@
TimeoutSec= value.
+
DefaultStartLimitInterval=DefaultStartLimitBurst=
- Configure the default start rate
- limiting, as configured per-service by
- StartLimitInterval= and
+ Configure the default
+ unit start rate limiting, as
+ configured per-service by
+ StartLimitInterval=
+ and
StartLimitBurst=. See
systemd.service5
for details on the per-service
- settings).
-
+ settings.
@@ -323,7 +372,7 @@
executed processes. Takes a
space-separated list of variable
assignments. See
- environ7
+ environ7
for details about environment
variables.
@@ -337,6 +386,23 @@
VAR3.
+
+ DefaultCPUAccounting=
+ DefaultBlockIOAccounting=
+ DefaultMemoryAccounting=
+
+ Configure the default
+ resource accounting settings, as
+ configured per-unit by
+ CPUAccounting=,
+ BlockIOAccounting=
+ and
+ MemoryAccounting=. See
+ systemd.resource-control5
+ for details on the per-unit
+ settings.
+
+
DefaultLimitCPU=DefaultLimitFSIZE=
@@ -380,8 +446,8 @@
systemd.directives7,
systemd.exec5,
systemd.service5,
- environ7,
- capabilities7
+ environ7,
+ capabilities7