From: Nishal Kulkarni <nishalkulkarni@gmail.com>
Date: Sun, 13 Mar 2022 19:11:11 +0000 (+0530)
Subject: man: Mention systemd-oomd now follows OOMPolicy
X-Git-Tag: v251-rc1~65^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F22629%2Fhead;p=thirdparty%2Fsystemd.git

man: Mention systemd-oomd now follows OOMPolicy
---

diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 400e35c4574..b104044cc26 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -505,7 +505,7 @@
         <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
+        Out-Of-Memory (OOM) killer or <command>systemd-oomd</command>. 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>
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 89a6c337594..5bb1679aea4 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -1039,7 +1039,7 @@ CapabilityBoundingSet=~CAP_B CAP_C</programlisting>
         normally at 0.</para>
 
         <para>Use the <varname>OOMPolicy=</varname> setting of service units to configure how the service
-        manager shall react to the kernel OOM killer terminating a process of the service.  See
+        manager shall react to the kernel OOM killer or <command>systemd-oomd</command> terminating a process of the service.  See
         <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
         for details.</para></listitem>
       </varlistentry>
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 95cb0aca3d4..4e4a9732e41 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -1140,7 +1140,11 @@
         shall be considered preferred or less preferred candidates for process termination by the Linux OOM
         killer logic. See
         <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry> for
-        details.</para></listitem>
+        details.</para>
+
+        <para>This setting also applies to <command>systemd-oomd</command>, similar to kernel OOM kills
+        this setting determines the state of the service after <command>systemd-oomd</command> kills a cgroup associated
+        with the service.</para></listitem>
       </varlistentry>
 
     </variablelist>