From e2d057456d69906fab64984d93c51a839f2d8702 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 10 Nov 2022 15:40:00 +0100
Subject: repart: Run most repart integration tests without root privileges

To make sure rootless mode keeps working, let's run all repart
integration tests that we can without root privileges. The only ones
we need to keep running with root privileges are the tests that operate
on a block/loop device and those that use --image=.
---
 test/TEST-58-REPART/test.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'test/TEST-58-REPART')

diff --git a/test/TEST-58-REPART/test.sh b/test/TEST-58-REPART/test.sh
index fb4a05fc77..0d513cf85b 100755
--- a/test/TEST-58-REPART/test.sh
+++ b/test/TEST-58-REPART/test.sh
@@ -12,14 +12,15 @@ TEST_FORCE_NEWIMAGE=1
 test_append_files() {
     if ! get_bool "${TEST_NO_QEMU:=}"; then
         install_dmevent
-        if command -v openssl >/dev/null 2>&1; then
-            inst_binary openssl
-        fi
-        inst_binary mcopy
         instmods dm_verity =md
         generate_module_dependencies
         image_install -o /sbin/mksquashfs
     fi
+
+    inst_binary mcopy
+    if command -v openssl >/dev/null 2>&1; then
+        inst_binary openssl
+    fi
 }
 
 do_test "$@"
-- 
cgit v1.2.1