From 942eba930b929f1b4fa3f72448d266d9cb46a216 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sat, 21 Sep 2024 22:11:25 +0200 Subject: [PATCH] repart: Use swap format for swap partition even if encrypted --- src/partition/repart.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/partition/repart.c b/src/partition/repart.c index 01175c46982..080a232e4ee 100644 --- a/src/partition/repart.c +++ b/src/partition/repart.c @@ -2357,11 +2357,11 @@ static int partition_read_definition(Partition *p, const char *path, const char if (!p->format) { const char *format = NULL; - if (partition_needs_populate(p) || (p->encrypt != ENCRYPT_OFF && !(p->copy_blocks_path || p->copy_blocks_auto))) + if (p->type.designator == PARTITION_SWAP) + format = "swap"; + else if (partition_needs_populate(p) || (p->encrypt != ENCRYPT_OFF && !(p->copy_blocks_path || p->copy_blocks_auto))) /* Pick "vfat" as file system for esp and xbootldr partitions, otherwise default to "ext4". */ format = IN_SET(p->type.designator, PARTITION_ESP, PARTITION_XBOOTLDR) ? "vfat" : "ext4"; - else if (p->type.designator == PARTITION_SWAP) - format = "swap"; if (format) { p->format = strdup(format); -- 2.47.3