]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
repart: Determine verity sig size based on partition designator
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 19 Sep 2024 12:04:34 +0000 (14:04 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 24 Sep 2024 07:07:41 +0000 (09:07 +0200)
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.

src/partition/repart.c

index 080a232e4ee1a5c94537b106aed7d5ebbf69f50e..48ba4d797323f8ed979dc925a5d212cd103e0725 100644 (file)
@@ -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;