diff options
| author | Nishal Kulkarni <nishalkulkarni@gmail.com> | 2022-03-13 20:11:11 +0100 |
|---|---|---|
| committer | Nishal Kulkarni <nishalkulkarni@gmail.com> | 2022-03-22 13:34:52 +0100 |
| commit | 2e3591a4fdd9c46be7bd34f3ff41c0d58dbe23d2 (patch) | |
| tree | c05b3daaa283d1739f0e4b82bf9135d089bcf757 | |
| parent | test/oomd: Add test for new oomd_ooms xattr (diff) | |
| download | systemd-2e3591a4fdd9c46be7bd34f3ff41c0d58dbe23d2.tar.xz systemd-2e3591a4fdd9c46be7bd34f3ff41c0d58dbe23d2.zip | |
man: Mention systemd-oomd now follows OOMPolicy
| -rw-r--r-- | man/systemd-system.conf.xml | 2 | ||||
| -rw-r--r-- | man/systemd.exec.xml | 2 | ||||
| -rw-r--r-- | man/systemd.service.xml | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 400e35c457..b104044cc2 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 89a6c33759..5bb1679aea 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 95cb0aca3d..4e4a9732e4 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> |