From 4f2dba98adcfcb1131d667a9395d3d33e7c4e35a Mon Sep 17 00:00:00 2001
From: Luca Boccassi <bluca@debian.org>
Date: Mon, 7 Mar 2022 16:20:42 +0000
Subject: [PATCH] TEST-29: do not pass -q to mk/unsquashfs, not supported on
 CentOS 8

---
 test/test-functions        | 8 ++++----
 test/units/testsuite-29.sh | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/test-functions b/test/test-functions
index c4da06d870f..e815ce1c585 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -607,7 +607,7 @@ ExecStart=sleep 120
 EOF
         cp "$initdir/usr/lib/systemd/system/minimal-app0.service" "$initdir/usr/lib/systemd/system/minimal-app0-foo.service"
 
-        mksquashfs "$initdir" "$oldinitdir/usr/share/minimal_0.raw" -noappend -quiet
+        mksquashfs "$initdir" "$oldinitdir/usr/share/minimal_0.raw" -noappend
         veritysetup format "$oldinitdir/usr/share/minimal_0.raw" "$oldinitdir/usr/share/minimal_0.verity" | \
             grep '^Root hash:' | cut -f2 | tr -d '\n' >"$oldinitdir/usr/share/minimal_0.roothash"
 
@@ -615,7 +615,7 @@ EOF
         rm "$initdir/usr/lib/systemd/system/minimal-app0-foo.service"
         cp "$initdir/usr/lib/systemd/system/minimal-app0.service" "$initdir/usr/lib/systemd/system/minimal-app0-bar.service"
 
-        mksquashfs "$initdir" "$oldinitdir/usr/share/minimal_1.raw" -noappend -quiet
+        mksquashfs "$initdir" "$oldinitdir/usr/share/minimal_1.raw" -noappend
         veritysetup format "$oldinitdir/usr/share/minimal_1.raw" "$oldinitdir/usr/share/minimal_1.verity" | \
             grep '^Root hash:' | cut -f2 | tr -d '\n' >"$oldinitdir/usr/share/minimal_1.roothash"
 
@@ -647,7 +647,7 @@ cat /usr/lib/extension-release.d/extension-release.app0
 EOF
         chmod +x "$initdir/opt/script0.sh"
         echo MARKER=1 >"$initdir/usr/lib/systemd/system/some_file"
-        mksquashfs "$initdir" "$oldinitdir/usr/share/app0.raw" -noappend -quiet
+        mksquashfs "$initdir" "$oldinitdir/usr/share/app0.raw" -noappend
 
         export initdir="$TESTDIR/app1"
         mkdir -p "$initdir/usr/lib/extension-release.d" "$initdir/usr/lib/systemd/system" "$initdir/opt"
@@ -673,7 +673,7 @@ cat /usr/lib/extension-release.d/extension-release.app2
 EOF
         chmod +x "$initdir/opt/script1.sh"
         echo MARKER=1 >"$initdir/usr/lib/systemd/system/other_file"
-        mksquashfs "$initdir" "$oldinitdir/usr/share/app1.raw" -noappend -quiet
+        mksquashfs "$initdir" "$oldinitdir/usr/share/app1.raw" -noappend
     )
 }
 
diff --git a/test/units/testsuite-29.sh b/test/units/testsuite-29.sh
index 75731b41f2e..c4e31b0a2d5 100755
--- a/test/units/testsuite-29.sh
+++ b/test/units/testsuite-29.sh
@@ -47,8 +47,8 @@ portablectl list | grep -q -F "No images."
 
 # portablectl also works with directory paths rather than images
 
-unsquashfs -q -dest /tmp/minimal_0 /usr/share/minimal_0.raw
-unsquashfs -q -dest /tmp/minimal_1 /usr/share/minimal_1.raw
+unsquashfs -dest /tmp/minimal_0 /usr/share/minimal_0.raw
+unsquashfs -dest /tmp/minimal_1 /usr/share/minimal_1.raw
 
 portablectl "${ARGS[@]}" attach --copy=symlink --now --runtime /tmp/minimal_0 minimal-app0