X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-system.conf.xml;h=6105c5131c33eeeef7d177c0d4a3961b9ae5b38a;hb=f7d68aa8c9430dfddee5f913f93b405a5d75723a;hp=f3a89ad45903bee63a0efbbd2c7a4ddeb456a88f;hpb=66f756d437658cc464bfb5647c97efd0cf77f933;p=elogind.git
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index f3a89ad45..6105c5131 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -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.
@@ -259,8 +259,8 @@
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 +268,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,6 +280,27 @@
too.
+
+ 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=
@@ -292,7 +314,7 @@
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 +323,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 +347,7 @@
executed processes. Takes a
space-separated list of variable
assignments. See
- environ7
+ environ7
for details about environment
variables.
@@ -337,6 +361,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 +421,8 @@
systemd.directives7,
systemd.exec5,
systemd.service5,
- environ7,
- capabilities7
+ environ7,
+ capabilities7