From d29a4b9e63617d46914c83a4d11633d43c334f83 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 19 Sep 2024 14:04:34 +0200 Subject: [PATCH] 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) (cherry picked from commit 4143bc70ed7d131cda9f0aa2f86d4aedd38e0fce) (cherry picked from commit d371cb47251f1a8772cb136056123e5dc583eb65) --- src/partition/repart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/partition/repart.c b/src/partition/repart.c index 98b4c74c6f..9974844474 100644 --- a/src/partition/repart.c +++ b/src/partition/repart.c @@ -610,7 +610,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;