summaryrefslogtreecommitdiffstats
path: root/src/shared
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2024-07-25 13:22:42 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2024-07-26 08:27:24 +0200
commitae07feb401ff70b122650ac01041021703d4b8ad (patch)
tree38ea3362214efb6ad96dc8ebb6c733b28a12deb9 /src/shared
parentTEST-54-CREDS: Specify SMBIOS creds via corresponding mkosi option (diff)
downloadsystemd-ae07feb401ff70b122650ac01041021703d4b8ad.tar.xz
systemd-ae07feb401ff70b122650ac01041021703d4b8ad.zip
resize-fs: Put minimal ext4 size in the same ballpark as the other filesystems
TEST-46-HOMED fails on ext4 because the filesystem is deemed to small for activation by cryptsetup. Let's bump the minimal filesystem size for ext4 a bit to be in the same ballpark as ext4 and btrfs to avoid weird errors due to impossibly small filesystems. Also use U64_MB while we're touching this.
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/resize-fs.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/resize-fs.h b/src/shared/resize-fs.h
index b40943c992..bacaec748d 100644
--- a/src/shared/resize-fs.h
+++ b/src/shared/resize-fs.h
@@ -7,9 +7,9 @@
int resize_fs(int fd, uint64_t sz, uint64_t *ret_size);
-#define BTRFS_MINIMAL_SIZE (256U*1024U*1024U)
-#define XFS_MINIMAL_SIZE (300U*1024U*1024U)
-#define EXT4_MINIMAL_SIZE (1024U*1024U)
+#define BTRFS_MINIMAL_SIZE (256U*U64_MB)
+#define XFS_MINIMAL_SIZE (300U*U64_MB)
+#define EXT4_MINIMAL_SIZE (32U*U64_MB)
uint64_t minimal_size_by_fs_magic(statfs_f_type_t magic);
uint64_t minimal_size_by_fs_name(const char *str);