diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-07-22 17:40:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-22 17:40:12 +0200 |
| commit | 5052c4eadd31715ed21e091dec0dce5f4f3d7baa (patch) | |
| tree | 5f03c55daf026b4ceac99ae71de3d9645224d17b /man/systemd-system.conf.xml | |
| parent | fec603eb6cbba4ea03ef01e3ad48fa85a4812a9c (diff) | |
| parent | b3785cd5e6a0ac4d465713db221e1a150aabd5f6 (diff) | |
Merge pull request #3753 from poettering/tasks-max-scale
Add support for relative TasksMax= specifications, and bump default for services
Diffstat (limited to 'man/systemd-system.conf.xml')
| -rw-r--r-- | man/systemd-system.conf.xml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 8833e73c72..1bb40fd234 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -325,12 +325,11 @@ <varlistentry> <term><varname>DefaultTasksMax=</varname></term> - <listitem><para>Configure the default value for the per-unit - <varname>TasksMax=</varname> setting. See + <listitem><para>Configure the default value for the per-unit <varname>TasksMax=</varname> setting. See <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry> - for details. This setting applies to all unit types that - support resource control settings, with the exception of slice - units. Defaults to 512.</para></listitem> + for details. This setting applies to all unit types that support resource control settings, with the exception + of slice units. Defaults to 15%, which equals 4915 with the kernel's defaults on the host, but might be smaller + in OS containers.</para></listitem> </varlistentry> <varlistentry> |