mkfs-util: Redirect mksquashfs output to /dev/null

The -quiet option for mksquashfs was added somewhat recently so to
support older versions, let's redirect stdout of mksquashfs to
/dev/null instead.

diff --git a/src/shared/mkfs-util.c b/src/shared/mkfs-util.c
index 6c259009af4cbe65d2a715b031436d8ae8739c26..bfaa4d1b55b311aeed66f5ccee1e265f4f331ee4 100644 (file)
--- a/src/shared/mkfs-util.c
+++ b/src/shared/mkfs-util.c
@@ -455,14 +455,16 @@ int make_filesystem(
                                 "-U", vol_id,
                                 node);
 
-        else if (streq(fstype, "squashfs"))
+        else if (streq(fstype, "squashfs")) {
 
                 argv = strv_new(mkfs,
                                 root, node,
-                                "-quiet",
                                 "-noappend");
 
-        else if (streq(fstype, "erofs"))
+                /* mksquashfs -quiet option is pretty new so let's redirect stdout to /dev/null instead. */
+                stdio_fds[1] = -EBADF;
+
+        } else if (streq(fstype, "erofs"))
 
                 argv = strv_new(mkfs,
                                 "-U", vol_id,