From 7bc6c028968942643eb7176d77f7347626cdd3be Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 15 Aug 2023 12:58:28 +0200 Subject: [PATCH] repart: Massage the minimize for XFS a bit A 1.5 multiplier doesn't seem to be sufficient for XFS as seen in mkosi CI. Let's increase it to 2 for XFS to hopefully get better results. --- src/partition/repart.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/partition/repart.c b/src/partition/repart.c index a9d5526700f..4eced612b99 100644 --- a/src/partition/repart.c +++ b/src/partition/repart.c @@ -6107,7 +6107,8 @@ static int context_minimize(Context *context) { /* Massage the size a bit because just going by actual data used in the sparse file isn't * fool-proof. */ - fsz = round_up_size(fsz + (fsz / 2), context->grain_size); + uint64_t heuristic = streq(p->format, "xfs") ? fsz : fsz / 2; + fsz = round_up_size(fsz + heuristic, context->grain_size); if (minimal_size_by_fs_name(p->format) != UINT64_MAX) fsz = MAX(minimal_size_by_fs_name(p->format), fsz); -- 2.47.3