summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2016-01-26 13:36:30 +0100
committerDaniel Mack <github@zonque.org>2016-01-26 13:36:30 +0100
commitd8fc78b40fab1d1545b384eb0b8928b78c8828ff (patch)
treee03c2fe69ba3d459f55fbfa5ce51216945793016
parentafb3e6335a7e75afa24db9dff6860f45f0fcc940 (diff)
parent5abea6149a9ed02a93cf8b3d881a01df2e5a27d1 (diff)
Merge pull request #2436 from grawity/fix/tasks-max
logind: update documentation for cf7d1a30e44
-rw-r--r--man/logind.conf.xml2
-rw-r--r--src/login/logind.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 94376656d5..48130aa003 100644
--- a/man/logind.conf.xml
+++ b/man/logind.conf.xml
@@ -288,7 +288,7 @@
<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 4096.</para></listitem>
+ for details. Defaults to 12288 (12K).</para></listitem>
</varlistentry>
<varlistentry>
diff --git a/src/login/logind.conf b/src/login/logind.conf
index 81f6695434..6095e482ac 100644
--- a/src/login/logind.conf
+++ b/src/login/logind.conf
@@ -32,4 +32,4 @@
#IdleActionSec=30min
#RuntimeDirectorySize=10%
#RemoveIPC=yes
-#UserTasksMax=4096
+#UserTasksMax=12288