summaryrefslogtreecommitdiff
path: root/man/logind.conf.xml
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-12-07 22:25:26 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2018-04-25 16:18:45 +0200
commit284149392755f086d0a714071c33aa609e61505e (patch)
tree434b114440ebd448b2492e802c9d102cce4f6875 /man/logind.conf.xml
parent250e9fadbcc0ca90e697d7efb40855b054ed3b8f (diff)
downloadsystemd-284149392755f086d0a714071c33aa609e61505e.tar.gz
Use a dash-truncated drop-in for user-%j.slice configuration
This removes the UserTasksMax= setting in logind.conf. Instead, the generic TasksMax= setting on the slice should be used. Instead of a transient unit we use a drop-in to tweak the default definition of a .slice. It's better to use the normal unit mechanisms instead of creating units on the fly. This will also make it easier to start user@.service independently of logind, or set additional settings like MemoryMax= for user slices. The setting in logind is removed, because otherwise we would have two sources of "truth": the slice on disk and the logind config. Instead of trying to coordinate those two sources of configuration (and maintainer overrides to both), let's just convert to the new one fully. Right now now automatic transition mechanism is provided. logind will emit a hint when it encounters the setting, but otherwise it will be ignored. Fixes #2556.
Diffstat (limited to 'man/logind.conf.xml')
-rw-r--r--man/logind.conf.xml11
1 files changed, 0 insertions, 11 deletions
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 9e21c0b218..a35faf15c5 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -326,17 +326,6 @@
</varlistentry>
<varlistentry>
- <term><varname>UserTasksMax=</varname></term>
-
- <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. 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>
<term><varname>RemoveIPC=</varname></term>
<listitem><para>Controls whether System V and POSIX IPC objects belonging to the user shall be removed when the