From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 14 May 2025 12:24:51 +0000 (+0200)
Subject: ci: extend validatefs testcase to validate verity partitions
X-Git-Tag: v258-rc1~620^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=61b15b78e5f3904491d2a023883d4823fd2c5393;p=thirdparty%2Fsystemd.git

ci: extend validatefs testcase to validate verity partitions
---

diff --git a/test/units/TEST-87-AUX-UTILS-VM.validatefs.sh b/test/units/TEST-87-AUX-UTILS-VM.validatefs.sh
index bee835d2213..ede0d710195 100755
--- a/test/units/TEST-87-AUX-UTILS-VM.validatefs.sh
+++ b/test/units/TEST-87-AUX-UTILS-VM.validatefs.sh
@@ -40,6 +40,16 @@ cat > /tmp/validatefs-test/validatefs-usr.conf <<EOF
 Type=usr
 Label=plisch
 Format=ext4
+Verity=data
+VerityMatchKey=mupf
+EOF
+
+cat > /tmp/validatefs-test/validatefs-usr-verity.conf <<EOF
+[Partition]
+Type=usr-verity
+Label=plisch-verity
+Verity=hash
+VerityMatchKey=mupf
 EOF
 
 cat > /tmp/validatefs-test/validatefs-home.conf <<EOF
@@ -76,8 +86,8 @@ getfattr --dump /tmp/validatefs-test.mount/ | grep -q user.validatefs.mount_poin
 (! /usr/lib/systemd/systemd-validatefs /tmp/validatefs-test.mount/ )
 
 getfattr --dump /tmp/validatefs-test.mount/usr
-getfattr --dump /tmp/validatefs-test.mount/usr | grep -q user.validatefs.gpt_type_uuid=
-getfattr --dump /tmp/validatefs-test.mount/usr | grep -q user.validatefs.gpt_label=\"plisch\"
+getfattr --dump /tmp/validatefs-test.mount/usr | grep -q user.validatefs.gpt_type_uuid='".*\\000.*"'
+getfattr --dump /tmp/validatefs-test.mount/usr | grep -q user.validatefs.gpt_label='"plisch\\000plisch-verity"'
 getfattr --dump /tmp/validatefs-test.mount/usr | grep -q user.validatefs.mount_point=\"/usr\"
 /usr/lib/systemd/systemd-validatefs --root=/tmp/validatefs-test.mount /tmp/validatefs-test.mount/usr
 (! /usr/lib/systemd/systemd-validatefs /tmp/validatefs-test.mount/usr )