system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-04 15:21:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

repart: Default to swap format for swap partitions

Browse source
This commit is contained in:
Daan De Meyer 2023-08-16 16:53:02 +02:00
parent 409986ed3e
commit 973d6be402
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/partition/repart.c
View file

@ -1733,11 +1733,20 @@ static int partition_read_definition(Partition *p, const char *path, const char
return log_syntax(NULL, LOG_ERR, path, 1, SYNTHETIC_ERRNO(EINVAL),
"Format=swap and CopyFiles= cannot be combined, refusing.");
if (!p->format && (!strv_isempty(p->copy_files) || !strv_isempty(p->make_directories) || (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". */
p->format = strdup(IN_SET(p->type.designator, PARTITION_ESP, PARTITION_XBOOTLDR) ? "vfat" : "ext4");
if (!p->format)
return log_oom();
if (!p->format) {
const char *format = NULL;
if (!strv_isempty(p->copy_files) || !strv_isempty(p->make_directories) || (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);
if (!p->format)
return log_oom();
}
}
if (p->minimize != MINIMIZE_OFF && !p->format && p->verity != VERITY_HASH)

1
test/TEST-58-REPART/test.sh
View file

@ -22,6 +22,7 @@ test_append_files() {
fi
inst_binary mcopy
image_install mkswap
if command -v openssl >/dev/null 2>&1; then
inst_binary openssl
fi