diff options
| author | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-05-14 13:13:24 +0200 |
|---|---|---|
| committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-05-14 19:32:07 +0200 |
| commit | 807626d1ce1c963715ebb3946d25734e748b8270 (patch) | |
| tree | 79dcf08f9c3aeb5bf974df3fa55939af1d590f5a /test | |
| parent | 9f596939e4d39523d4d87bf16f3687c5b5e22dc4 (diff) | |
| download | systemd-807626d1ce1c963715ebb3946d25734e748b8270.tar.gz | |
test: install the overlayfs/loop modules unconditionally
Diffstat (limited to 'test')
| -rwxr-xr-x | test/TEST-29-PORTABLE/test.sh | 19 | ||||
| -rwxr-xr-x | test/TEST-43-PRIVATEUSER-UNPRIV/test.sh | 8 | ||||
| -rwxr-xr-x | test/TEST-50-DISSECT/test.sh | 25 | ||||
| -rw-r--r-- | test/test-functions | 7 |
4 files changed, 22 insertions, 37 deletions
diff --git a/test/TEST-29-PORTABLE/test.sh b/test/TEST-29-PORTABLE/test.sh index 7727e7b5ca..d826db6b57 100755 --- 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 6e1a91a649..844c08ab1f 100755 --- 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 276dd7c716..2d44ca2b6e 100755 --- 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 0bd011b2ed..2a733d8b8f 100644 --- 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 |