From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 19 Sep 2024 12:04:34 +0000 (+0200)
Subject: repart: Determine verity sig size based on partition designator
X-Git-Tag: v257-rc1~373
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e11745d000d7e9b3112bb336735c1bdfa77e9add;p=thirdparty%2Fsystemd.git

repart: Determine verity sig size based on partition designator

Verity= is an image build concept, not a first boot concept, whereas
a partition designator is always available, so let's do the size stuff
based on that.
---

diff --git a/src/partition/repart.c b/src/partition/repart.c
index 080a232e4ee..48ba4d79732 100644
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -814,7 +814,7 @@ static uint64_t partition_min_size(const Context *context, const Partition *p) {
                 return p->current_size;
         }
 
-        if (p->verity == VERITY_SIG)
+        if (IN_SET(p->type.designator, PARTITION_ROOT_VERITY_SIG, PARTITION_USR_VERITY_SIG))
                 return VERITY_SIG_SIZE;
 
         sz = p->current_size != UINT64_MAX ? p->current_size : HARD_MIN_SIZE;