From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Sun, 23 Feb 2025 19:05:24 +0000 (+0000)
Subject: repart: when using erofs and log level is not debug, use --quiet
X-Git-Tag: v257.4~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b92ea51d000e69d032b0a8cf80bf2714a95e69c2;p=thirdparty%2Fsystemd.git

repart: when using erofs and log level is not debug, use --quiet

mkfs.erofs is extremely verbose and will log every single file added
to the filesystem, which is a lot of them when building a rootfs.

(cherry picked from commit 323213cfea8b78d44f63b8a83f74fbd1f79f1775)
---

diff --git a/src/repart/repart.c b/src/repart/repart.c
index b2a2bda2a28..a1ded8481e4 100644
--- a/src/repart/repart.c
+++ b/src/repart/repart.c
@@ -5992,7 +5992,8 @@ static int context_mkfs(Context *context) {
                         return r;
 
                 r = make_filesystem(partition_target_path(t), p->format, strempty(p->new_label), root,
-                                    p->fs_uuid, arg_discard, /* quiet = */ false,
+                                    p->fs_uuid, arg_discard,
+                                    /* quiet = */ streq(p->format, "erofs") && !DEBUG_LOGGING,
                                     context->fs_sector_size, p->compression, p->compression_level,
                                     extra_mkfs_options);
                 if (r < 0)
@@ -7556,7 +7557,8 @@ static int context_minimize(Context *context) {
                                     strempty(p->new_label),
                                     root,
                                     fs_uuid,
-                                    arg_discard, /* quiet = */ false,
+                                    arg_discard,
+                                    /* quiet = */ streq(p->format, "erofs") && !DEBUG_LOGGING,
                                     context->fs_sector_size,
                                     p->compression,
                                     p->compression_level,
@@ -7639,7 +7641,7 @@ static int context_minimize(Context *context) {
                                     root,
                                     p->fs_uuid,
                                     arg_discard,
-                                    /* quiet = */ false,
+                                    /* quiet = */ streq(p->format, "erofs") && !DEBUG_LOGGING,
                                     context->fs_sector_size,
                                     p->compression,
                                     p->compression_level,