validatefs: fix checks on file systems backed by multiple devices (i.e. verity) (#37434)

Fixes #37157
This commit is contained in:
Lennart Poettering
2025-05-14 17:53:06 +02:00
committed by GitHub
5 changed files with 311 additions and 134 deletions
+12 -2
View File
@@ -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 )