From c848516f3f3356d52cbc10eb270f531d48820648 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Tue, 22 Sep 2020 15:24:59 +0100 Subject: [PATCH] dissect-image: do not refuse verity GPT without /usr partition Only enforce that /usr verity partition is present if a /usr partition is there --- src/shared/dissect-image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index 8947da8102..3a2200f91e 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -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) {