diff options
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-system.conf.xml | 31 | ||||
| -rw-r--r-- | man/systemd.resource-control.xml | 20 |
2 files changed, 39 insertions, 12 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> diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml index e923b6da86..c3fd5fcee4 100644 --- a/man/systemd.resource-control.xml +++ b/man/systemd.resource-control.xml @@ -105,8 +105,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. <para>Turn on CPU usage accounting for this unit. Takes a boolean argument. Note that turning on CPU accounting for one unit might also implicitly turn it on for all units - contained in the same slice and for all its parent slices and - the units contained therein.</para> + contained in the same slice and for all its parent slices + and the units contained therein. The system default for this + setting maybe controlled with + <varname>DefaultCPUAccounting=</varname> in + <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para> </listitem> </varlistentry> @@ -132,8 +135,10 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. <para>Turn on process and kernel memory accounting for this unit. Takes a boolean argument. Note that turning on memory accounting for one unit might also implicitly turn it on for - all units contained in the same slice and for all its parent - slices and the units contained therein.</para> + all its parent slices. The system default for this setting + maybe controlled with + <varname>DefaultMemoryAccounting=</varname> in + <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para> </listitem> </varlistentry> @@ -164,8 +169,11 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. <para>Turn on Block IO accounting for this unit. Takes a boolean argument. Note that turning on block IO accounting for one unit might also implicitly turn it on for all units - contained in the same slice and all for its parent slices and - the units contained therein.</para> + contained in the same slice and all for its parent slices + and the units contained therein. The system default for this + setting maybe controlled with + <varname>DefaultBlockIOAccounting=</varname> in + <citerefentry><refentrytitle>systemd-system.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para> </listitem> </varlistentry> |