From: Luca Boccassi <luca.boccassi@microsoft.com>
Date: Tue, 22 Sep 2020 14:24:59 +0000 (+0100)
Subject: dissect-image: do not refuse verity GPT without /usr partition
X-Git-Tag: v247-rc1~191^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F17124%2Fhead;p=thirdparty%2Fsystemd.git

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

Only enforce that /usr verity partition is present if a /usr
partition is there
---

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 8947da81024..3a2200f91e7 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) {