From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 18 May 2023 19:47:34 +0000 (+0900)
Subject: unit: add conditions and deps to make oomd.socket and .service consistent
X-Git-Tag: v254-rc1~443
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0e3ae838f5417c7cda1cc32d944a32f55af2e96;p=thirdparty%2Fsystemd.git

unit: add conditions and deps to make oomd.socket and .service consistent

Fixes #27690.
---

diff --git a/units/systemd-oomd.socket b/units/systemd-oomd.socket
index 47cd0e75558..70eb6b7bc3c 100644
--- a/units/systemd-oomd.socket
+++ b/units/systemd-oomd.socket
@@ -11,7 +11,13 @@
 Description=Userspace Out-Of-Memory (OOM) Killer Socket
 Documentation=man:systemd-oomd.service(8)
 DefaultDependencies=no
-Before=sockets.target
+Before=sockets.target shutdown.target
+Conflicts=shutdown.target
+ConditionControlGroupController=v2
+ConditionControlGroupController=memory
+ConditionPathExists=/proc/pressure/cpu
+ConditionPathExists=/proc/pressure/io
+ConditionPathExists=/proc/pressure/memory
 
 [Socket]
 ListenStream=/run/systemd/oom/io.system.ManagedOOM