diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-04-26 10:09:10 +0200 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-04-26 10:09:10 +0200 |
| commit | e463e257c70120a66324abfaa11ef7fe4319a697 (patch) | |
| tree | 97ef19f8e9c7b72e5c52c8da5d667d01fbe91113 /src/partition | |
| parent | deeae10e26aaa0114bc008285c5dfc721716dbc8 (diff) | |
| download | systemd-e463e257c70120a66324abfaa11ef7fe4319a697.tar.gz | |
repart: Move partition_defer() out of format_verity_hash/sig()
To allow re-using format_verity_hash() for minimizing verity hash
partitions.
Diffstat (limited to 'src/partition')
| -rw-r--r-- | src/partition/repart.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/partition/repart.c b/src/partition/repart.c index 448513ff4d..08ca4f4c0b 100644 --- a/src/partition/repart.c +++ b/src/partition/repart.c @@ -3568,9 +3568,6 @@ static int partition_format_verity_hash( if (PARTITION_EXISTS(p)) /* Never format existing partitions */ return 0; - if (partition_defer(p)) - return 0; - assert_se(dp = p->siblings[VERITY_DATA]); assert(!dp->dropped); @@ -3711,9 +3708,6 @@ static int partition_format_verity_sig(Context *context, Partition *p) { if (PARTITION_EXISTS(p)) return 0; - if (partition_defer(p)) - return 0; - assert_se(hp = p->siblings[VERITY_HASH]); assert(!hp->dropped); @@ -3814,14 +3808,14 @@ static int context_copy_blocks(Context *context) { log_info("Copying in of '%s' on block level completed.", p->copy_blocks_path); - if (p->siblings[VERITY_HASH]) { + if (p->siblings[VERITY_HASH] && !partition_defer(p->siblings[VERITY_HASH])) { r = partition_format_verity_hash(context, p->siblings[VERITY_HASH], partition_target_path(t)); if (r < 0) return r; } - if (p->siblings[VERITY_SIG]) { + if (p->siblings[VERITY_SIG] && !partition_defer(p->siblings[VERITY_SIG])) { r = partition_format_verity_sig(context, p->siblings[VERITY_SIG]); if (r < 0) return r; @@ -4232,14 +4226,14 @@ static int context_mkfs(Context *context) { if (r < 0) return r; - if (p->siblings[VERITY_HASH]) { + if (p->siblings[VERITY_HASH] && !partition_defer(p->siblings[VERITY_HASH])) { r = partition_format_verity_hash(context, p->siblings[VERITY_HASH], partition_target_path(t)); if (r < 0) return r; } - if (p->siblings[VERITY_SIG]) { + if (p->siblings[VERITY_SIG] && !partition_defer(p->siblings[VERITY_SIG])) { r = partition_format_verity_sig(context, p->siblings[VERITY_SIG]); if (r < 0) return r; |