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:
parent
7025fa8b1a
commit
c848516f3f
|
@ -956,7 +956,7 @@ int dissect_image(
|
||||||
return -EADDRNOTAVAIL;
|
return -EADDRNOTAVAIL;
|
||||||
|
|
||||||
/* Combinations of verity /usr with verity-less root is OK, but the reverse is not */
|
/* 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;
|
return -EADDRNOTAVAIL;
|
||||||
|
|
||||||
if (verity && verity->root_hash) {
|
if (verity && verity->root_hash) {
|
||||||
|
|
Loading…
Reference in New Issue