From 2bc148add017b1ffc5cdaa4a87d848eac4f4251b Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 15 Jul 2020 17:54:12 +0100 Subject: [PATCH] test: exercise RootImage, RootHash and RootVerity in TEST-50-DISSECT Run with both the single-filesystem image and the GPT image --- test/units/testsuite-50.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/units/testsuite-50.sh b/test/units/testsuite-50.sh index 363726cdddb..8b24e4e0cde 100755 --- a/test/units/testsuite-50.sh +++ b/test/units/testsuite-50.sh @@ -45,6 +45,14 @@ cat ${image_dir}/mount/etc/os-release | grep -q -F -f /usr/lib/os-release cat ${image_dir}/mount/usr/lib/os-release | grep -q -F "MARKER=1" umount ${image_dir}/mount +systemd-run -t --property RootImage=${image}.raw /usr/bin/cat /usr/lib/os-release | grep -q -F "MARKER=1" +mv ${image}.verity ${image}.fooverity +mv ${image}.roothash ${image}.foohash +systemd-run -t --property RootImage=${image}.raw --property RootHash=${image}.foohash --property RootVerity=${image}.fooverity /usr/bin/cat /usr/lib/os-release | grep -q -F "MARKER=1" +systemd-run -t --property RootImage=${image}.raw --property RootHash=${roothash} --property RootVerity=${image}.fooverity /usr/bin/cat /usr/lib/os-release | grep -q -F "MARKER=1" +mv ${image}.fooverity ${image}.verity +mv ${image}.foohash ${image}.roothash + # Make a GPT disk on the fly, with the squashfs as partition 1 and the verity hash tree as partition 2 machine="$(uname -m)" if [ "${machine}" = "x86_64" ]; then @@ -98,6 +106,8 @@ cat ${image_dir}/mount/etc/os-release | grep -q -F -f /usr/lib/os-release cat ${image_dir}/mount/usr/lib/os-release | grep -q -F "MARKER=1" umount ${image_dir}/mount +systemd-run -t --property RootImage=${image}.gpt --property RootHash=${roothash} /usr/bin/cat /usr/lib/os-release | grep -q -F "MARKER=1" + echo OK > /testok exit 0 -- 2.47.3