summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Märdian <slyon@ubuntu.com>2021-12-15 11:13:43 +0100
committerLukas Märdian <slyon@ubuntu.com>2022-01-25 16:30:17 +0100
commit771fee9e73316c92e065e93946ec64c578b43706 (patch)
tree25f7fac982d99c571e6636d374dc9c1dab5ed5b9
parentf4e16926c4e146f0b106a277b5b499c78db82bcb (diff)
d/control: Ship oomd in a systemd-oomd package
Deploying the default configuration as used in Fedora.
-rw-r--r--debian/control11
-rw-r--r--debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf2
-rw-r--r--debian/extra/systemd-oomd-defaults/oomd.conf.d/10-oomd-defaults.conf2
-rw-r--r--debian/extra/systemd-oomd-defaults/user@.service.d/10-oomd-user-service-defaults.conf3
-rw-r--r--debian/systemd-oomd.install10
5 files changed, 28 insertions, 0 deletions
diff --git a/debian/control b/debian/control
index 0b01ff828c..f133d57070 100644
--- a/debian/control
+++ b/debian/control
@@ -430,3 +430,14 @@ Description: Standalone tmpfiles binary for use in non-systemd systems
Standalone tmpfiles binary with minimal dependencies.
This package conflicts with the main systemd package and is meant for use in
non-systemd systems.
+
+Package: systemd-oomd
+Section: admin
+Architecture: linux-any
+Priority: optional
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+Description: A userspace out-of-memory (OOM) killer
+ systemd-oomd is a system service that uses cgroups-v2 and
+ pressure stall information (PSI) to monitor and take action on
+ processes before an OOM occurs in kernel space.
diff --git a/debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf b/debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf
new file mode 100644
index 0000000000..49958e8e0d
--- /dev/null
+++ b/debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf
@@ -0,0 +1,2 @@
+[Slice]
+ManagedOOMSwap=kill
diff --git a/debian/extra/systemd-oomd-defaults/oomd.conf.d/10-oomd-defaults.conf b/debian/extra/systemd-oomd-defaults/oomd.conf.d/10-oomd-defaults.conf
new file mode 100644
index 0000000000..025465712c
--- /dev/null
+++ b/debian/extra/systemd-oomd-defaults/oomd.conf.d/10-oomd-defaults.conf
@@ -0,0 +1,2 @@
+[OOM]
+DefaultMemoryPressureDurationSec=20s
diff --git a/debian/extra/systemd-oomd-defaults/user@.service.d/10-oomd-user-service-defaults.conf b/debian/extra/systemd-oomd-defaults/user@.service.d/10-oomd-user-service-defaults.conf
new file mode 100644
index 0000000000..94d5c87fe0
--- /dev/null
+++ b/debian/extra/systemd-oomd-defaults/user@.service.d/10-oomd-user-service-defaults.conf
@@ -0,0 +1,3 @@
+[Service]
+ManagedOOMMemoryPressure=kill
+ManagedOOMMemoryPressureLimit=50%
diff --git a/debian/systemd-oomd.install b/debian/systemd-oomd.install
new file mode 100644
index 0000000000..d93ba5f14e
--- /dev/null
+++ b/debian/systemd-oomd.install
@@ -0,0 +1,10 @@
+../../extra/systemd-oomd-defaults/oomd.conf.d/* usr/lib/systemd/oomd.conf.d/
+../../extra/systemd-oomd-defaults/-.slice.d/* usr/lib/systemd/system/-.slice.d/
+../../extra/systemd-oomd-defaults/user@.service.d/* usr/lib/systemd/system/user@.service.d/
+bin/oomctl
+etc/systemd/oomd.conf
+lib/systemd/systemd-oomd
+lib/systemd/system/systemd-oomd.service
+usr/lib/sysusers.d/systemd-oom.conf
+usr/share/dbus-1/*/*oom*
+usr/share/man/man*/*oom*