diff options
| author | Lennart Poettering <lennart@poettering.net> | 2021-11-23 16:34:40 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2021-11-23 22:55:49 +0100 |
| commit | 9ead4184132c373612fda67fa623a1e3e1c4dfb6 (patch) | |
| tree | 2733569d9d751f7156638724feefd729cb449c5f | |
| parent | 994c9c70a166c5e5c383cf651b6cb4077e8f183e (diff) | |
| download | systemd-9ead4184132c373612fda67fa623a1e3e1c4dfb6.tar.gz | |
test: test new SYSEXT_SCOPE=/PORTABLE_PREFIXES= fields in TEST-29
| -rw-r--r-- | test/test-functions | 5 | ||||
| -rwxr-xr-x | test/units/testsuite-29.sh | 18 |
2 files changed, 20 insertions, 3 deletions
diff --git a/test/test-functions b/test/test-functions index a4b7efb5ec..0a3745de52 100644 --- a/test/test-functions +++ b/test/test-functions @@ -594,6 +594,7 @@ install_verity_minimal() { touch "$initdir/etc/machine-id" "$initdir/etc/resolv.conf" touch "$initdir/opt/some_file" echo MARKER=1 >>"$initdir/usr/lib/os-release" + echo "PORTABLE_PREFIXES=app0 minimal" >>"$initdir/usr/lib/os-release" echo -e "[Service]\nExecStartPre=cat /usr/lib/os-release\nExecStart=sleep 120" >"$initdir/usr/lib/systemd/system/app0.service" cp "$initdir/usr/lib/systemd/system/app0.service" "$initdir/usr/lib/systemd/system/app0-foo.service" @@ -638,7 +639,9 @@ EOF export initdir="$TESTDIR/app1" mkdir -p "$initdir/usr/lib/extension-release.d" "$initdir/usr/lib/systemd/system" "$initdir/opt" grep "^ID=" "$os_release" >"$initdir/usr/lib/extension-release.d/extension-release.app2" - echo "${version_id}" >>"$initdir/usr/lib/extension-release.d/extension-release.app2" + ( echo "${version_id}" + echo "SYSEXT_SCOPE=portable" + echo "PORTABLE_PREFIXES=app1" ) >>"$initdir/usr/lib/extension-release.d/extension-release.app2" setfattr -n user.extension-release.strict -v false "$initdir/usr/lib/extension-release.d/extension-release.app2" cat >"$initdir/usr/lib/systemd/system/app1.service" <<EOF [Service] diff --git a/test/units/testsuite-29.sh b/test/units/testsuite-29.sh index 11f1832aa4..0e0c8cf41d 100755 --- a/test/units/testsuite-29.sh +++ b/test/units/testsuite-29.sh @@ -12,6 +12,11 @@ if [[ -v ASAN_OPTIONS || -v UBSAN_OPTIONS ]]; then ARGS+=(--profile=trusted) fi +systemd-dissect --no-pager /usr/share/minimal_0.raw | grep -q '✓ portable service' +systemd-dissect --no-pager /usr/share/minimal_1.raw | grep -q '✓ portable service' +systemd-dissect --no-pager /usr/share/app0.raw | grep -q '✓ extension for portable service' +systemd-dissect --no-pager /usr/share/app1.raw | grep -q '✓ extension for portable service' + export SYSTEMD_LOG_LEVEL=debug mkdir -p /run/systemd/system/systemd-portabled.service.d/ cat <<EOF >/run/systemd/system/systemd-portabled.service.d/override.conf @@ -98,10 +103,19 @@ portablectl detach --now --runtime --extension /usr/share/app1.raw /usr/share/mi # portablectl also works with directory paths rather than images -mkdir /tmp/rootdir /tmp/app1 /tmp/overlay +mkdir /tmp/rootdir /tmp/app1 /tmp/overlay /tmp/os-release-fix /tmp/os-release-fix/etc mount /usr/share/app1.raw /tmp/app1 mount /usr/share/minimal_0.raw /tmp/rootdir -mount -t overlay overlay -o lowerdir=/tmp/app1:/tmp/rootdir /tmp/overlay + +# Fix up os-release to drop the valid PORTABLE_SERVICES field (because we are +# bypassing the sysext logic in portabled here it will otherwise not see the +# extensions additional valid prefix) +grep -v "^PORTABLE_PREFIXES=" /tmp/rootdir/etc/os-release > /tmp/os-release-fix/etc/os-release + +mount -t overlay overlay -o lowerdir=/tmp/os-release-fix:/tmp/app1:/tmp/rootdir /tmp/overlay + +grep . /tmp/overlay/usr/lib/extension-release.d/* +grep . /tmp/overlay/etc/os-release portablectl "${ARGS[@]}" attach --copy=symlink --now --runtime /tmp/overlay app1 |