summaryrefslogtreecommitdiff
path: root/man/logind.conf.xml
diff options
context:
space:
mode:
authorTejun Heo <htejun@fb.com>2016-08-18 22:57:53 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-08-18 22:57:53 -0400
commitf50582649f8eee73f59aff95fadd9a963ed4ffea (patch)
treec6a575a986838cf9756e7f394067f0f0d659b6c7 /man/logind.conf.xml
parentda983f8852f2a79a0b34648357e88553f947f336 (diff)
downloadsystemd-f50582649f8eee73f59aff95fadd9a963ed4ffea.tar.gz
logind: update empty and "infinity" handling for [User]TasksMax (#3835)
The parsing functions for [User]TasksMax were inconsistent. Empty string and "infinity" were interpreted as no limit for TasksMax but not accepted for UserTasksMax. Update them so that they're consistent with other knobs. * Empty string indicates the default value. * "infinity" indicates no limit. While at it, replace opencoded (uint64_t) -1 with CGROUP_LIMIT_MAX in TasksMax handling. v2: Update empty string to indicate the default value as suggested by Zbigniew Jędrzejewski-Szmek. v3: Fixed empty UserTasksMax handling.
Diffstat (limited to 'man/logind.conf.xml')
-rw-r--r--man/logind.conf.xml5
1 files changed, 3 insertions, 2 deletions
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index adba5a4131..cbee83357b 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -318,8 +318,9 @@
<listitem><para>Sets the maximum number of OS tasks each user may run concurrently. This controls the
<varname>TasksMax=</varname> setting of the per-user slice unit, see
<citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>
- for details. Defaults to 33%, which equals 10813 with the kernel's defaults on the host, but might be smaller
- in OS containers.</para></listitem>
+ for details. If assigned the special value <literal>infinity</literal>, no tasks limit is applied.
+ Defaults to 33%, which equals 10813 with the kernel's defaults on the host, but might be smaller in
+ OS containers.</para></listitem>
</varlistentry>
<varlistentry>