Merge pull request #18751 from anitazha/oomdconditions

units: add Conditions for systemd-oomd.service
2021-02-23 15:30:33 +01:00
parent 3acf00a5a4 e7b3f1a6c3
commit e74bd83a82
2 changed files with 7 additions and 0 deletions
@@ -126,6 +126,9 @@ REQUIREMENTS:
        Required for systemd-nspawn:
          CONFIG_DEVPTS_MULTIPLE_INSTANCES or Linux kernel >= 4.7

+        Required for systemd-oomd:
+          CONFIG_PSI
+
        Note that kernel auditing is broken when used with systemd's
        container code. When using systemd in conjunction with
        containers, please make sure to either turn off auditing at
@@ -13,6 +13,10 @@ Documentation=man:systemd-oomd.service(8)
 DefaultDependencies=no
 Before=multi-user.target shutdown.target
 Conflicts=shutdown.target
+ConditionControlGroupController=v2
+ConditionPathExists=/proc/pressure/cpu
+ConditionPathExists=/proc/pressure/io
+ConditionPathExists=/proc/pressure/memory

 [Service]
 AmbientCapabilities=CAP_KILL CAP_DAC_OVERRIDE