]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
mkfs-util: Silence noisy warning from mkfs.btrfs
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 23 May 2023 10:16:53 +0000 (12:16 +0200)
committerLuca Boccassi <luca.boccassi@gmail.com>
Tue, 23 May 2023 18:46:31 +0000 (19:46 +0100)
src/shared/mkfs-util.c

index 3d8c16b7b973bc9b4cd6cec761b61df5ed95c8fd..08e89dc228a83fd17ec9f11d16a9cd907f490806 100644 (file)
@@ -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" */