dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-03 14:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

repart: Use swap format for swap partition even if encrypted

Browse Source
This commit is contained in:
Daan De Meyer
2024-09-21 22:11:25 +02:00
parent f3b8e81f54
commit 942eba930b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/partition/repart.c
View File

@@ -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);