Merge ~enr0n/ubuntu/+source/systemd:ubuntu-jammy into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-jammy

[Nick Rosbrook]

[Lukas Märdian (slyon)]

LGTM, thanks!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 6ba4b8d..95b5b03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-systemd (249.11-0ubuntu3.4) UNRELEASED; urgency=medium
+systemd (249.11-0ubuntu3.4) jammy; urgency=medium
 
   [ Mustafa Kemal Gilor ]
   * d/p/lp1978079-efi-pstore-not-cleared-on-boot.patch: pstore: Run after
@@ -8,7 +8,14 @@ systemd (249.11-0ubuntu3.4) UNRELEASED; urgency=medium
     File: debian/patches/lp1978079-efi-pstore-not-cleared-on-boot.patch
     https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=d990b13612810a296246011ad66a165b30166702
 
- -- Lukas Märdian <[e-mail]>  Thu, 23 Jun 2022 16:53:43 +0200
+  [ Nick Rosbrook ]
+  * systemd-oomd: set ManagedOOMSwap=auto on -.slice (LP: #1972159)
+    This has the effect of disabling swap kill by default, so cgroups will
+    only be monitored for memory pressure, and not swap usage.
+    File: debian/extra/systemd-oomd-defaults/-.slice.d/10-oomd-root-slice-defaults.conf
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=e93c944c58ec376454301e9c9b55d35be7c14a89
+
+ -- Nick Rosbrook <[e-mail]>  Mon, 27 Jun 2022 14:28:46 -0400
 
 systemd (249.11-0ubuntu3.3) jammy; urgency=medium
 
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
index 49958e8..9862d0f 100644
--- 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
@@ -1,2 +1,2 @@
 [Slice]
-ManagedOOMSwap=kill
+ManagedOOMSwap=auto