From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 9 Sep 2021 09:29:19 +0000 (+0200)
Subject: dissect-image: drop redundant check
X-Git-Tag: v250-rc1~701^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ab5b2787fbd9100cac1b50a8e52707ba824d9756;p=thirdparty%2Fsystemd.git

dissect-image: drop redundant check

We already check whether we discovered a /usr verity partition without a
/usr partition when initially mangling the partitions, a bunch of lines
further up, no need to repeat this here.
---

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 3279c843ecf..8a139d4f8c6 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -1390,10 +1390,6 @@ int dissect_image(
             !(m->partitions[PARTITION_ROOT].found || (m->partitions[PARTITION_USR].found && FLAGS_SET(flags, DISSECT_IMAGE_USR_NO_ROOT))))
                 return -ENXIO;
 
-        /* Refuse if we found a verity partition for /usr but no matching file system partition */
-        if (!m->partitions[PARTITION_USR].found && m->partitions[PARTITION_USR_VERITY].found)
-                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].found && !m->partitions[PARTITION_USR_VERITY].found)
                 return -EADDRNOTAVAIL;