1
1
mirror of https://github.com/systemd/systemd-stable.git synced 2025-03-12 08:58:20 +03:00

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)
(cherry picked from commit d29a4b9e63617d46914c83a4d11633d43c334f83)
This commit is contained in:
Daan De Meyer 2024-09-19 14:04:34 +02:00 committed by Luca Boccassi
parent 52ccb2d558
commit 9787154222

View File

@ -598,7 +598,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;