From 85c494f7e79fc015f1ad4ce39bf118d8627c4daa Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 14 Mar 2023 14:32:37 +0100 Subject: [PATCH] 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. --- src/shared/mkfs-util.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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,