picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dissect-image: do not refuse verity GPT without /usr partition 

Only enforce that /usr verity partition is present if a /usr
partition is there
This commit is contained in:
Luca Boccassi 2020-09-22 15:24:59 +01:00
parent 7025fa8b1a
commit c848516f3f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/shared/dissect-image.c
View File

@ -956,7 +956,7 @@ int dissect_image(
return -EADDRNOTAVAIL;
/* Combinations of verity /usr with verity-less root is OK, but the reverse is not */
if (m->partitions[PARTITION_ROOT_VERITY].found && !m->partitions[PARTITION_USR_VERITY].found)
if (m->partitions[PARTITION_ROOT_VERITY].found && m->partitions[PARTITION_USR].found && !m->partitions[PARTITION_USR_VERITY].found)
return -EADDRNOTAVAIL;
if (verity && verity->root_hash) {