diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-02-24 23:50:10 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-02-24 23:50:10 +0100 |
| commit | 085afe36cb823e7d5b8c5f3ef21ebb9639bac78b (patch) | |
| tree | 25b26a8b92d8562983b22098d0dfe5777efc8927 /man/systemd-system.conf.xml | |
| parent | 4e72e29a390e0bd9226eb802d80b9a9c259565cd (diff) | |
core: add global settings for enabling CPUAccounting=, MemoryAccounting=, BlockIOAccounting= for all units at once
Diffstat (limited to 'man/systemd-system.conf.xml')
| -rw-r--r-- | man/systemd-system.conf.xml | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index f3a89ad459..a7dfc0329c 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -292,7 +292,7 @@ <varname>TimeoutStartSec=</varname>, <varname>TimeoutStopSec=</varname> and <varname>RestartSec=</varname> (for - service units, see + services, see <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details on the per-unit settings). For non-service units, @@ -301,18 +301,20 @@ <varname>TimeoutSec=</varname> value. </para></listitem> </varlistentry> + <varlistentry> <term><varname>DefaultStartLimitInterval=</varname></term> <term><varname>DefaultStartLimitBurst=</varname></term> - <listitem><para>Configure the default start rate - limiting, as configured per-service by - <varname>StartLimitInterval=</varname> and + <listitem><para>Configure the default + unit start rate limiting, as + configured per-service by + <varname>StartLimitInterval=</varname> + and <varname>StartLimitBurst=</varname>. See <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details on the per-service - settings). - </para></listitem> + settings.</para></listitem> </varlistentry> <varlistentry> @@ -338,6 +340,23 @@ </varlistentry> <varlistentry> + <term><varname>DefaultCPUAccounting=</varname></term> + <term><varname>DefaultBlockIOAccounting=</varname></term> + <term><varname>DefaultMemoryAccounting=</varname></term> + + <listitem><para>Configure the default + resource accounting settings, as + configured per-unit by + <varname>CPUAccounting=</varname>, + <varname>BlockIOAccounting=</varname> + and + <varname>MemoryAccounting=</varname>. See + <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry> + for details on the per-unit + settings.</para></listitem> + </varlistentry> + + <varlistentry> <term><varname>DefaultLimitCPU=</varname></term> <term><varname>DefaultLimitFSIZE=</varname></term> <term><varname>DefaultLimitDATA=</varname></term> |