diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c index f1288b41a7..0bccf63a8a 100644 --- a/src/dissect/dissect.c +++ b/src/dissect/dissect.c @@ -467,7 +467,7 @@ static int action_dissect(DissectedImage *m, LoopDevice *d) { return log_oom(); } - t = table_new("rw", "designator", "partition uuid", "partition label", "fstype", "architecture", "verity", "node", "partno"); + t = table_new("rw", "designator", "partition uuid", "partition label", "fstype", "architecture", "verity", "growfs", "node", "partno"); if (!t) return log_oom(); @@ -511,6 +511,10 @@ static int action_dissect(DissectedImage *m, LoopDevice *d) { if (r < 0) return table_log_add_error(r); + r = table_add_many(t, TABLE_BOOLEAN, (int) p->growfs); + if (r < 0) + return table_log_add_error(r); + if (p->partno < 0) /* no partition table, naked file system */ { r = table_add_cell(t, NULL, TABLE_STRING, arg_image); if (r < 0) diff --git a/test/units/testsuite-50.sh b/test/units/testsuite-50.sh index 505d93c13b..48a152166c 100755 --- a/test/units/testsuite-50.sh +++ b/test/units/testsuite-50.sh @@ -130,8 +130,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"'","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 --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",' +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,' systemd-dissect --root-hash "${roothash}" "${image}.gpt" | grep -q -F "MARKER=1" systemd-dissect --root-hash "${roothash}" "${image}.gpt" | grep -q -F -f <(sed 's/"//g' "$os_release")