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

[Nick Rosbrook]

This autopkgtest log demonstrates the QEMU tests being skipped on ppc64el: https://autopkgtest.ubuntu.com/results/autopkgtest-kinetic-enr0n-systemd-251/kinetic/ppc64el/s/systemd/20221011_154325_67eec@/log.gz.

[Lukas Märdian (slyon)]

Thank you for the PPA test build and PPA autopkgtest run showing the mitigation of the problem.

LGTM!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 4740d17..c7ddcfc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+systemd (251.4-1ubuntu7) kinetic; urgency=medium
+
+  [ Nick Rosbrook ]
+  * autopkgtest: do not allow qemu to be used on ppc64el (LP: #1992178)
+    Almost every run on ppc64el takes 12 to 24 hours, so do this as a last
+    resort to relieve pressure on autopkgtest infrastructure.
+    File: debian/tests/upstream
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=5ab2b8ad13a3d7441935d6f43bb81fbd540e2c33
+
+  [ Dan Streetman ]
+  * make machinectl read-only work (LP: #1991829)
+    Author: Dan Streetman
+    File: debian/patches/lp1991829-add-CAP_LINUX_IMMUTABLE-to-systemd-machined-so-it-ca.patch
+    https://git.launchpad.net/~ubuntu-core-dev/ubuntu/+source/systemd/commit/?id=a8a41b11d712c8cfbf595d34f39d95096f23e202
+
+ -- Nick Rosbrook <[e-mail]>  Tue, 11 Oct 2022 11:51:25 -0400
+
 systemd (251.4-1ubuntu6) kinetic; urgency=medium
 
   * test: deny-list TEST-36-NUMAPOLICY on ppc64el (LP: #1989969)
diff --git a/debian/patches/lp1991829-add-CAP_LINUX_IMMUTABLE-to-systemd-machined-so-it-ca.patch b/debian/patches/lp1991829-add-CAP_LINUX_IMMUTABLE-to-systemd-machined-so-it-ca.patch
new file mode 100644
index 0000000..d35aa0f
--- /dev/null
+++ b/debian/patches/lp1991829-add-CAP_LINUX_IMMUTABLE-to-systemd-machined-so-it-ca.patch
@@ -0,0 +1,29 @@
+From 137d162c42ed858613afc3d7493d08d4ae6d5c1b Mon Sep 17 00:00:00 2001
+From: Dan Streetman <[e-mail]>
+Date: Fri, 16 Sep 2022 10:50:59 -0400
+Subject: [PATCH] add CAP_LINUX_IMMUTABLE to systemd-machined, so it can handle
+ machinectl read-only requests
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1991829
+Origin: upstream, https://github.com/systemd/systemd/pull/24697
+
+Without this, the 'machinectl read-only ...' command always fails.
+---
+ units/systemd-machined.service.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/units/systemd-machined.service.in b/units/systemd-machined.service.in
+index e92f436dfd..d3f8abd9e4 100644
+--- a/units/systemd-machined.service.in
++++ b/units/systemd-machined.service.in
+@@ -18,7 +18,7 @@ RequiresMountsFor=/var/lib/machines
+ 
+ [Service]
+ BusName=org.freedesktop.machine1
+-CapabilityBoundingSet=CAP_KILL CAP_SYS_PTRACE CAP_SYS_ADMIN CAP_SETGID CAP_SYS_CHROOT CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_CHOWN CAP_FOWNER CAP_FSETID CAP_MKNOD
++CapabilityBoundingSet=CAP_KILL CAP_SYS_PTRACE CAP_SYS_ADMIN CAP_SETGID CAP_SYS_CHROOT CAP_DAC_READ_SEARCH CAP_DAC_OVERRIDE CAP_CHOWN CAP_FOWNER CAP_FSETID CAP_MKNOD CAP_LINUX_IMMUTABLE
+ ExecStart={{ROOTLIBEXECDIR}}/systemd-machined
+ IPAddressDeny=any
+ LockPersonality=yes
+-- 
+2.34.1
+
diff --git a/debian/patches/series b/debian/patches/series
index f85c48e..5b33e52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -51,3 +51,4 @@ test-copy-libgcc_s.so.1-to-TPM2-test-image-on-Debian-like.patch
 lp1981042-core-firstboot-workaround-timezone-issues-caused-by-Ubunt.patch
 test-denylist-TEST-29-PORTABLE-again.patch
 lp1989969-test-deny-list-TEST-36-NUMAPOLICY-on-ppc64el.patch
+lp1991829-add-CAP_LINUX_IMMUTABLE-to-systemd-machined-so-it-ca.patch
diff --git a/debian/tests/upstream b/debian/tests/upstream
index f05f14c..0d60a21 100755
--- a/debian/tests/upstream
+++ b/debian/tests/upstream
@@ -24,4 +24,10 @@ export TEST_SHOW_JOURNAL=warning
 export TEST_REQUIRE_INSTALL_TESTS=0
 export TEST_PREFER_NSPAWN=1
 export NO_BUILD=1
+
+# Temporarily disable tests running in QEMU on ppc64el (LP: #1992178)
+if [ "$DPKGARCH" = "ppc64el" ]; then
+    export TEST_NO_QEMU=1
+fi
+
 test/run-integration-tests.sh