[Merge] ~enr0n/ubuntu/+source/systemd:ubuntu-focal into ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-focal

Lukas Märdian mp+455719 at code.launchpad.net
Tue Nov 21 14:17:26 UTC 2023


Review: Approve

Thank you for providing autopkgtest results and PPA test builds! Those are mostly upstream cherry-picks, the patch for Bug #1837227 is a backport that seems to match upstream's new logic AFAICT.

LGTM!


Some non-blocking remarks:

- Bug #2029352
This seems to be lacking the SRU template. Also, we should put a clear comment in the bug report as to why this is ONLY needed on Focal. It seems to be fixed upstream as of v251, so we should put an argument why we don't need it for Jammy.

- lp2029352-test-ignore-LXC-filesystem-when-checking-for-writable-loc.patch
See inline comment about double escaping. Might be worth double-checking, just to be safe.

Diff comments:

> diff --git a/debian/patches/lp2029352-test-ignore-LXC-filesystem-when-checking-for-writable-loc.patch b/debian/patches/lp2029352-test-ignore-LXC-filesystem-when-checking-for-writable-loc.patch
> new file mode 100644
> index 0000000..d76ac3c
> --- /dev/null
> +++ b/debian/patches/lp2029352-test-ignore-LXC-filesystem-when-checking-for-writable-loc.patch
> @@ -0,0 +1,29 @@
> +From: Luca Boccassi <bluca at debian.org>
> +Date: Wed, 11 May 2022 12:24:10 +0100
> +Subject: test: ignore LXC filesystem when checking for writable locations
> +
> +Origin: upstream, https://github.com/systemd/systemd/commit/646cba5c4208c28c56dbe52d676ab1a176c69b7f
> +Bug-Ubuntu: https://launchpad.net/bugs/2029352
> +
> +test-execute checks that only /var/lib/private/waldo is writable, but there are
> +some filesystems that are always writable and excluded. Add /sys/devices/system/cpu
> +which is created by lxcfs.
> +
> +Fixes https://github.com/systemd/systemd/issues/23263
> +---
> + test/test-execute/exec-dynamicuser-statedir.service | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/test/test-execute/exec-dynamicuser-statedir.service b/test/test-execute/exec-dynamicuser-statedir.service
> +index ca40934..4ec6c53 100644
> +--- a/test/test-execute/exec-dynamicuser-statedir.service
> ++++ b/test/test-execute/exec-dynamicuser-statedir.service
> +@@ -13,7 +13,7 @@ ExecStart=test -f /var/lib/private/quux/pief/yayyay
> + ExecStart=/bin/sh -x -c 'test "$$STATE_DIRECTORY" = "%S/waldo:%S/quux/pief"'
> +
> + # Make sure that /var/lib/private/waldo is really the only writable directory besides the obvious candidates
> +-ExecStart=sh -x -c 'test $$(find / \( -path /var/tmp -o -path /tmp -o -path /proc -o -path /dev/mqueue -o -path /dev/shm -o -path /sys/fs/bpf -o -path /dev/.lxc \) -prune -o -type d -writable -print 2>/dev/null | sort -u | tr -d '\\\\n') = /var/lib/private/quux/pief/var/lib/private/waldo'
> ++ExecStart=sh -x -c 'test $$(find / \\( -path /var/tmp -o -path /tmp -o -path /proc -o -path /dev/mqueue -o -path /dev/shm -o -path /sys/fs/bpf -o -path /dev/.lxc -o -path /sys/devices/system/cpu \\) -prune -o -type d -writable -print 2>/dev/null | sort -u | tr -d "\\\\n") = /var/lib/private/quux/pief/var/lib/private/waldo'

Be careful with the double-escaping here ("\\"). It is being used in the upstream commit, but might have side effects in our Focal branch, which didn't use the double-escaping before.

> +
> + Type=oneshot
> + DynamicUser=yes


-- 
https://code.launchpad.net/~enr0n/ubuntu/+source/systemd/+git/systemd/+merge/455719
Your team Ubuntu Core Development Team is subscribed to branch ~ubuntu-core-dev/ubuntu/+source/systemd:ubuntu-focal.




More information about the Ubuntu-reviews mailing list