X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=man%2Fsystemd-system.conf.xml;h=3814bd2ad8a20c60ecab4ee1ec969433a6f594a3;hb=f1721625e7145977ba705e169580f2eb0002600c;hp=6c1b1e7ee7d415c01f15944103963115bc247464;hpb=73e231abde39f22097df50542c745e01de879836;p=elogind.git
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 6c1b1e7ee..3814bd2ad 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.
@@ -216,7 +216,7 @@
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
@@ -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,39 @@
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.
+
+
+
+ DefaultCPUQuotaPeriodSec=
+
+ Sets the default CPU
+ quota period. Defaults to 100ms. This
+ controls th global default for the
+ CPUQuotaPeriodSec=
+ setting of units, see
+ systemd.resource-control5
+ for details.
+
+
DefaultTimeoutStartSec=
DefaultTimeoutStopSec=
@@ -292,7 +326,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 +335,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.
@@ -337,6 +373,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=