diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-03-31 10:31:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 10:31:32 +0200 |
| commit | b880ac2c151638d05791c5685af6dadf054c61d7 (patch) | |
| tree | a65fcbd07e831bd80655cfafea9fbca1834638e6 /test/units | |
| parent | compress: support streaming lz4 without full input mmap (diff) | |
| parent | update TODO (diff) | |
| download | systemd-b880ac2c151638d05791c5685af6dadf054c61d7.tar.xz systemd-b880ac2c151638d05791c5685af6dadf054c61d7.zip | |
Merge pull request #18958 from poettering/dissect-no-root
dissect-image: support images without rootfs but with /usr partition + support simple partition versioning via strverscmp() on part label
Diffstat (limited to 'test/units')
| -rwxr-xr-x | test/units/testsuite-50.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/units/testsuite-50.sh b/test/units/testsuite-50.sh index b4a5fee842..e2d8ef6da2 100755 --- a/test/units/testsuite-50.sh +++ b/test/units/testsuite-50.sh @@ -30,13 +30,13 @@ roothash="$(cat ${image}.roothash)" os_release=$(test -e /etc/os-release && echo /etc/os-release || echo /usr/lib/os-release) -systemd-dissect --json=short ${image}.raw | grep -q -F '{"rw":"ro","designator":"root","partition_uuid":null,"fstype":"squashfs","architecture":null,"verity":"external"' +systemd-dissect --json=short ${image}.raw | grep -q -F '{"rw":"ro","designator":"root","partition_uuid":null,"partition_label":null,"fstype":"squashfs","architecture":null,"verity":"external"' systemd-dissect ${image}.raw | grep -q -F "MARKER=1" systemd-dissect ${image}.raw | grep -q -F -f $os_release mv ${image}.verity ${image}.fooverity mv ${image}.roothash ${image}.foohash -systemd-dissect --json=short ${image}.raw --root-hash=${roothash} --verity-data=${image}.fooverity | grep -q -F '{"rw":"ro","designator":"root","partition_uuid":null,"fstype":"squashfs","architecture":null,"verity":"external"' +systemd-dissect --json=short ${image}.raw --root-hash=${roothash} --verity-data=${image}.fooverity | grep -q -F '{"rw":"ro","designator":"root","partition_uuid":null,"partition_label":null,"fstype":"squashfs","architecture":null,"verity":"external"' systemd-dissect ${image}.raw --root-hash=${roothash} --verity-data=${image}.fooverity | grep -q -F "MARKER=1" systemd-dissect ${image}.raw --root-hash=${roothash} --verity-data=${image}.fooverity | grep -q -F -f $os_release mv ${image}.fooverity ${image}.verity @@ -127,8 +127,8 @@ losetup -d ${loop} ROOT_UUID=$(systemd-id128 -u show $(head -c 32 ${image}.roothash) -u | tail -n 1 | cut -b 6-) VERITY_UUID=$(systemd-id128 -u show $(tail -c 32 ${image}.roothash) -u | tail -n 1 | cut -b 6-) -systemd-dissect --json=short --root-hash ${roothash} ${image}.gpt | grep -q '{"rw":"ro","designator":"root","partition_uuid":"'$ROOT_UUID'","fstype":"squashfs","architecture":"'$architecture'","verity":"yes","node":' -systemd-dissect --json=short --root-hash ${roothash} ${image}.gpt | grep -q '{"rw":"ro","designator":"root-verity","partition_uuid":"'$VERITY_UUID'","fstype":"DM_verity_hash","architecture":"'$architecture'","verity":null,"node":' +systemd-dissect --json=short --root-hash ${roothash} ${image}.gpt | grep -q '{"rw":"ro","designator":"root","partition_uuid":"'$ROOT_UUID'","partition_label":"Root Partition","fstype":"squashfs","architecture":"'$architecture'","verity":"yes","node":' +systemd-dissect --json=short --root-hash ${roothash} ${image}.gpt | grep -q '{"rw":"ro","designator":"root-verity","partition_uuid":"'$VERITY_UUID'","partition_label":"Verity Partition","fstype":"DM_verity_hash","architecture":"'$architecture'","verity":null,"node":' systemd-dissect --root-hash ${roothash} ${image}.gpt | grep -q -F "MARKER=1" systemd-dissect --root-hash ${roothash} ${image}.gpt | grep -q -F -f $os_release |