summaryrefslogtreecommitdiff
path: root/man/systemd-system.conf.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-11-13 17:13:55 +0100
committerLennart Poettering <lennart@poettering.net>2015-11-13 19:50:52 +0100
commit0af20ea2ee2af2bcf2258e7a8e1a13181a6a75d6 (patch)
tree0fee32b93ed0b93271670e4d68f8c5d7177ee312 /man/systemd-system.conf.xml
parentecee72e1b6c3476b674b58472c483fc4aef7ceed (diff)
core: add new DefaultTasksMax= setting for system.conf
This allows initializing the TasksMax= setting of all units by default to some fixed value, instead of leaving it at infinity as before.
Diffstat (limited to 'man/systemd-system.conf.xml')
-rw-r--r--man/systemd-system.conf.xml13
1 files changed, 12 insertions, 1 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 54ce992b85..0050f24f8e 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0'?> <!--*-nxml-*-->
+<?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
@@ -321,6 +321,17 @@
</varlistentry>
<varlistentry>
+ <term><varname>DefaultTasksMax=</varname></term>
+
+ <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.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><varname>DefaultLimitCPU=</varname></term>
<term><varname>DefaultLimitFSIZE=</varname></term>
<term><varname>DefaultLimitDATA=</varname></term>