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=a7dfc0329c6891e62875cf56521d9eb315a39924;hp=f3a89ad45903bee63a0efbbd2c7a4ddeb456a88f;hb=22fdeadcc06e95fe41ac4de872ec245c0887547f;hpb=66f756d437658cc464bfb5647c97efd0cf77f933
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index f3a89ad45..a7dfc0329 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -292,7 +292,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 +301,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 +339,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=