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.

(cherry picked from commit e11745d000d7e9b3112bb336735c1bdfa77e9add)

diff --git a/src/partition/repart.c b/src/partition/repart.c
index 6e36f9d5ac2a8f66b81cba0ea0079b94b14d2d65..72a2f7324527c774126aac8c304537d32d92961e 100644 (file)
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -704,7 +704,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;