diff --git a/man/systemd.scope.xml b/man/systemd.scope.xml
index 17d2700069..95969bf097 100644
--- a/man/systemd.scope.xml
+++ b/man/systemd.scope.xml
@@ -105,6 +105,8 @@
of scope units are the following:
+
+
RuntimeMaxSec=
diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index cae520ceab..1c9e59f722 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -1120,7 +1120,7 @@
above.
-
+
OOMPolicy=
Configure the out-of-memory (OOM) killing policy for the kernel and the userspace OOM
@@ -1133,18 +1133,17 @@
terminate services earlier, before the kernel would have to act.
This setting takes one of continue, stop or
- kill. If set to continue and a process of the service is
- killed by the OOM killer, this is logged but the service continues running. If set to
- stop the event is logged but the service is terminated cleanly by the service
- manager. If set to kill and one of the service's processes is killed by the OOM
- killer the kernel is instructed to kill all remaining processes of the service too, by setting the
+ kill. If set to continue and a process in the unit is
+ killed by the OOM killer, this is logged but the unit continues running. If set to
+ stop the event is logged but the unit is terminated cleanly by the service
+ manager. If set to kill and one of the unit's processes is killed by the OOM
+ killer the kernel is instructed to kill all remaining processes of the unit too, by setting the
memory.oom.group attribute to 1; also see kernel documentation.
-
+ url="https://docs.kernel.org/admin-guide/cgroup-v2.html">kernel documentation.
Defaults to the setting DefaultOOMPolicy= in
systemd-system.conf5
- is set to, except for services where Delegate= is turned on, where it defaults to
+ is set to, except for units where Delegate= is turned on, where it defaults to
continue.
Use the OOMScoreAdjust= setting to configure whether processes of the unit
@@ -1154,10 +1153,9 @@
details.
This setting also applies to systemd-oomd. Similarly to the kernel OOM
- kills, this setting determines the state of the service after systemd-oomd kills a
- cgroup associated with the service.
+ kills, this setting determines the state of the unit after systemd-oomd kills a
+ cgroup associated with it.
-
Check
diff --git a/src/core/load-fragment-gperf.gperf.in b/src/core/load-fragment-gperf.gperf.in
index bba6666a52..b315dd0afa 100644
--- a/src/core/load-fragment-gperf.gperf.in
+++ b/src/core/load-fragment-gperf.gperf.in
@@ -556,6 +556,7 @@ Path.TriggerLimitBurst, config_parse_unsigned,
Scope.RuntimeMaxSec, config_parse_sec, 0, offsetof(Scope, runtime_max_usec)
Scope.RuntimeRandomizedExtraSec, config_parse_sec, 0, offsetof(Scope, runtime_rand_extra_usec)
Scope.TimeoutStopSec, config_parse_sec, 0, offsetof(Scope, timeout_stop_usec)
+Scope.OOMPolicy, config_parse_oom_policy, 0, offsetof(Scope, oom_policy)
{# The [Install] section is ignored here #}
Install.Alias, NULL, 0, 0
Install.WantedBy, NULL, 0, 0