From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 23 May 2023 10:16:53 +0000 (+0200)
Subject: mkfs-util: Silence noisy warning from mkfs.btrfs
X-Git-Tag: v254-rc1~406
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a1a4bbea2dac027754e95a34b0d7079fc06f657d;p=thirdparty%2Fsystemd.git

mkfs-util: Silence noisy warning from mkfs.btrfs
---

diff --git a/src/shared/mkfs-util.c b/src/shared/mkfs-util.c
index 3d8c16b7b97..08e89dc228a 100644
--- a/src/shared/mkfs-util.c
+++ b/src/shared/mkfs-util.c
@@ -388,6 +388,11 @@ int make_filesystem(
                 if (quiet && strv_extend(&argv, "-q") < 0)
                         return log_oom();
 
+                /* mkfs.btrfs unconditionally warns about several settings changing from v5.15 onwards which
+                 * isn't silenced by "-q", so let's redirect stdout to /dev/null as well. */
+                if (quiet)
+                        stdio_fds[1] = -EBADF;
+
         } else if (streq(fstype, "f2fs")) {
                 argv = strv_new(mkfs,
                                 "-g",  /* "default options" */