summaryrefslogtreecommitdiff
path: root/man/systemd-system.conf.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2019-03-19 19:54:08 +0100
committerLennart Poettering <lennart@poettering.net>2019-04-09 11:17:58 +0200
commit8e74bf7f9c9f0e46066590603c3a7d1e04dbe6c4 (patch)
treef97d471f78c17248c1bb92893ca2b7063e544d5f /man/systemd-system.conf.xml
parent34e86947e96a5b0c23097c40856c8ccac3bbed43 (diff)
downloadsystemd-8e74bf7f9c9f0e46066590603c3a7d1e04dbe6c4.tar.gz
man: document new OOMPolicy= setting
Diffstat (limited to 'man/systemd-system.conf.xml')
-rw-r--r--man/systemd-system.conf.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index d23b3fb45d..5d1e4d1b97 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -364,6 +364,17 @@
limits are only defaults for units, they are not applied to PID 1
itself.</para></listitem>
</varlistentry>
+
+ <varlistentry>
+ <term><varname>DefaultOOMPolicy=</varname></term>
+
+ <listitem><para>Configure the default policy for reacting to processes being killed by the Linux
+ Out-Of-Memory (OOM) killer. This may be used to pick a global default for the per-unit
+ <varname>OOMPolicy=</varname> setting. See
+ <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+ for details. Note that this default is not used for services that have <varname>Delegate=</varname>
+ turned on.</para></listitem>
+ </varlistentry>
</variablelist>
</refsect1>