From f92256ace559c56e32e4f5eaa08702b87a3918fb Mon Sep 17 00:00:00 2001 From: Maanya Goenka Date: Thu, 13 Jul 2023 22:10:01 +0000 Subject: [PATCH] confext: test image wide systemd support for confext --- test/TEST-50-DISSECT/test.sh | 1 + test/units/testsuite-29.sh | 4 ++-- test/units/testsuite-50.sh | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) diff --git a/test/TEST-50-DISSECT/test.sh b/test/TEST-50-DISSECT/test.sh index 6e5179c8422..f1abce88873 100755 --- a/test/TEST-50-DISSECT/test.sh +++ b/test/TEST-50-DISSECT/test.sh @@ -24,6 +24,7 @@ test_append_files() { if command -v openssl >/dev/null 2>&1; then inst_binary openssl fi + inst_binary mksquashfs inst_binary unsquashfs install_verity_minimal } diff --git a/test/units/testsuite-29.sh b/test/units/testsuite-29.sh index cc4ddd7c990..18ec41727d0 100755 --- a/test/units/testsuite-29.sh +++ b/test/units/testsuite-29.sh @@ -31,8 +31,8 @@ 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' +systemd-dissect --no-pager /usr/share/app0.raw | grep -q '✓ sysext extension for portable service' +systemd-dissect --no-pager /usr/share/app1.raw | grep -q '✓ sysext extension for portable service' export SYSTEMD_LOG_LEVEL=debug mkdir -p /run/systemd/system/systemd-portabled.service.d/ diff --git a/test/units/testsuite-50.sh b/test/units/testsuite-50.sh index 5a48dd5cbd0..cf31ec72630 100755 --- a/test/units/testsuite-50.sh +++ b/test/units/testsuite-50.sh @@ -551,4 +551,36 @@ echo abc > abc systemd-dissect --copy-to /tmp/img abc /abc test -f /tmp/img/abc +# Test for dissect tool support with systemd-sysext +mkdir -p /run/extensions/ testkit/usr/lib/extension-release.d/ +echo "ID=_any" >testkit/usr/lib/extension-release.d/extension-release.testkit +echo "ARCHITECTURE=_any" >>testkit/usr/lib/extension-release.d/extension-release.testkit +echo "MARKER_SYSEXT_123" >testkit/usr/lib/testfile +mksquashfs testkit/ testkit.raw +cp testkit.raw /run/extensions/ +unsquashfs -l /run/extensions/testkit.raw +systemd-dissect --no-pager /run/extensions/testkit.raw | grep -q '✓ sysext extension for portable service' +systemd-dissect --no-pager /run/extensions/testkit.raw | grep -q '✓ sysext extension for system' +systemd-sysext merge +systemd-sysext status +grep -q -F "MARKER_SYSEXT_123" /usr/lib/testfile +systemd-sysext unmerge +rm -rf /run/extensions/ testkit/ + +# Test for dissect tool support with systemd-confext +mkdir -p /run/confexts/ testjob/etc/extension-release.d/ +echo "ID=_any" >testjob/etc/extension-release.d/extension-release.testjob +echo "ARCHITECTURE=_any" >>testjob/etc/extension-release.d/extension-release.testjob +echo "MARKER_CONFEXT_123" >testjob/etc/testfile +mksquashfs testjob/ testjob.raw +cp testjob.raw /run/confexts/ +unsquashfs -l /run/confexts/testjob.raw +systemd-dissect --no-pager /run/confexts/testjob.raw | grep -q '✓ confext extension for system' +systemd-dissect --no-pager /run/confexts/testjob.raw | grep -q '✓ confext extension for portable service' +systemd-confext merge +systemd-confext status +grep -q -F "MARKER_CONFEXT_123" /etc/testfile +systemd-confext unmerge +rm -rf /run/confexts/ testjob/ + touch /testok -- 2.47.3