test: install the overlayfs/loop modules unconditionally

diff --git a/test/TEST-29-PORTABLE/test.sh b/test/TEST-29-PORTABLE/test.sh
index 7727e7b5cae438e99e490f7c669d6ff23fa03829..d826db6b57f4991f97fef21a47c992e060536452 100755 (executable)
--- a/test/TEST-29-PORTABLE/test.sh
+++ b/test/TEST-29-PORTABLE/test.sh
@@ -12,19 +12,14 @@ TEST_INSTALL_VERITY_MINIMAL=1
 # shellcheck source=test/test-functions
 . "${TEST_BASE_DIR:?}/test-functions"
 
-# Need loop devices for mounting images
 test_append_files() {
-    (
-        instmods loop =block
-        instmods squashfs =squashfs
-        instmods dm_verity =md
-        instmods overlay =overlayfs
-        install_dmevent
-        generate_module_dependencies
-        inst_binary mksquashfs
-        inst_binary unsquashfs
-        install_verity_minimal
-    )
+    instmods squashfs =squashfs
+    instmods dm_verity =md
+    install_dmevent
+    generate_module_dependencies
+    inst_binary mksquashfs
+    inst_binary unsquashfs
+    install_verity_minimal
 }
 
 do_test "$@"

diff --git a/test/TEST-43-PRIVATEUSER-UNPRIV/test.sh b/test/TEST-43-PRIVATEUSER-UNPRIV/test.sh
index 6e1a91a64965376b448c1a96886b06a8333d239a..844c08ab1f2b78846cda6307ec99ebe340ea0644 100755 (executable)
--- a/test/TEST-43-PRIVATEUSER-UNPRIV/test.sh
+++ b/test/TEST-43-PRIVATEUSER-UNPRIV/test.sh
@@ -12,12 +12,8 @@ has_user_dbus_socket || exit 0
 command -v mksquashfs >/dev/null 2>&1 || exit 0
 
 test_append_files() {
-    (
-        instmods overlay =overlayfs
-        generate_module_dependencies
-        inst_binary unsquashfs
-        install_verity_minimal
-    )
+    inst_binary unsquashfs
+    install_verity_minimal
 }
 
 do_test "$@"

diff --git a/test/TEST-50-DISSECT/test.sh b/test/TEST-50-DISSECT/test.sh
index 276dd7c716cf582ff241c54341153c3a1d8aecef..2d44ca2b6ee21ccc91fe3446ac6b8bf7db05c89d 100755 (executable)
--- a/test/TEST-50-DISSECT/test.sh
+++ b/test/TEST-50-DISSECT/test.sh
@@ -16,22 +16,17 @@ command -v mksquashfs >/dev/null 2>&1 || exit 0
 command -v veritysetup >/dev/null 2>&1 || exit 0
 command -v sfdisk >/dev/null 2>&1 || exit 0
 
-# Need loop devices for systemd-dissect
 test_append_files() {
-    (
-        instmods loop =block
-        instmods squashfs =squashfs
-        instmods dm_verity =md
-        instmods overlay =overlayfs
-        install_dmevent
-        generate_module_dependencies
-        inst_binary wc
-        inst_binary sha256sum
-        if command -v openssl >/dev/null 2>&1; then
-            inst_binary openssl
-        fi
-        install_verity_minimal
-    )
+    instmods squashfs =squashfs
+    instmods dm_verity =md
+    install_dmevent
+    generate_module_dependencies
+    inst_binary wc
+    inst_binary sha256sum
+    if command -v openssl >/dev/null 2>&1; then
+        inst_binary openssl
+    fi
+    install_verity_minimal
 }
 
 do_test "$@"

diff --git a/test/test-functions b/test/test-functions
index 0bd011b2ed45005d2c11d5df84690baa4fb806cf..2a733d8b8f42153e6202e38fe21ffd8f4f66d07a 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -775,7 +775,6 @@ setup_basic_environment() {
     install_testuser
     has_user_dbus_socket && install_user_dbus
     setup_selinux
-    instmods veth
     install_depmod_files
     generate_module_dependencies
     if get_bool "$IS_BUILT_WITH_ASAN"; then
@@ -959,10 +958,10 @@ install_fs_tools() {
 install_modules() {
     dinfo "Install modules"
 
-    instmods loop
-    instmods vfat
+    instmods dummy vfat veth
+    instmods loop =block
     instmods nls_ascii =nls
-    instmods dummy
+    instmods overlay =overlayfs
     # for TEST-35-LOGIN
     instmods scsi_debug uinput