From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 14 Mar 2023 13:32:37 +0000 (+0100)
Subject: mkfs-util: Redirect mksquashfs output to /dev/null
X-Git-Tag: v254-rc1~1027
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85c494f7e79fc015f1ad4ce39bf118d8627c4daa;p=thirdparty%2Fsystemd.git

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 6c259009af4..bfaa4d1b55b 100644
--- 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,