summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-11-13 19:32:37 +0100
committerLennart Poettering <lennart@poettering.net>2015-11-16 11:58:04 +0100
commita5bc6e5450981e1f3f88e083f5070038a0211b74 (patch)
tree0aa889fe29f5256549efd8b15966d9ca09964e38
parent9ded9cd14cc03c67291b10a5c42ce5094ba0912f (diff)
logind: change default to UserTasksMax= to 4096
-rw-r--r--man/logind.conf.xml2
-rw-r--r--src/login/logind.c2
-rw-r--r--src/login/logind.conf2
3 files changed, 3 insertions, 3 deletions
diff --git a/man/logind.conf.xml b/man/logind.conf.xml
index 3cde267119..94376656d5 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.</para></listitem>
+ for details. Defaults to 4096.</para></listitem>
</varlistentry>
<varlistentry>
diff --git a/src/login/logind.c b/src/login/logind.c
index c3a2fb5acd..7b41174c64 100644
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -70,7 +70,7 @@ static Manager *manager_new(void) {
m->idle_action_not_before_usec = now(CLOCK_MONOTONIC);
m->runtime_dir_size = PAGE_ALIGN((size_t) (physical_memory() / 10)); /* 10% */
- m->user_tasks_max = (uint64_t) -1;
+ m->user_tasks_max = UINT64_C(4096);
m->devices = hashmap_new(&string_hash_ops);
m->seats = hashmap_new(&string_hash_ops);
diff --git a/src/login/logind.conf b/src/login/logind.conf
index e8f1487734..81f6695434 100644
--- a/src/login/logind.conf
+++ b/src/login/logind.conf
@@ -32,4 +32,4 @@
#IdleActionSec=30min
#RuntimeDirectorySize=10%
#RemoveIPC=yes
-#UserTasksMax=
+#UserTasksMax=4096