system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-22 10:44:58 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

test: install the overlayfs/loop modules unconditionally

Browse source
This commit is contained in:
Frantisek Sumsal 2023-05-14 13:13:24 +02:00
parent 9f596939e4
commit 807626d1ce
4 changed files with 22 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
test/TEST-29-PORTABLE/test.sh
View file

@ -12,19 +12,14 @@ TEST_INSTALL_VERITY_MINIMAL=1
# shellcheck source=test/test-functions # shellcheck source=test/test-functions
. "${TEST_BASE_DIR:?}/test-functions" . "${TEST_BASE_DIR:?}/test-functions"
# Need loop devices for mounting images
test_append_files() { test_append_files() {
( instmods squashfs =squashfs
instmods loop =block instmods dm_verity =md
instmods squashfs =squashfs install_dmevent
instmods dm_verity =md generate_module_dependencies
instmods overlay =overlayfs inst_binary mksquashfs
install_dmevent inst_binary unsquashfs
generate_module_dependencies install_verity_minimal
inst_binary mksquashfs
inst_binary unsquashfs
install_verity_minimal
)
} }
do_test "$@" do_test "$@"

8
test/TEST-43-PRIVATEUSER-UNPRIV/test.sh
View file

@ -12,12 +12,8 @@ has_user_dbus_socket || exit 0
command -v mksquashfs >/dev/null 2>&1 || exit 0 command -v mksquashfs >/dev/null 2>&1 || exit 0
test_append_files() { test_append_files() {
( inst_binary unsquashfs
instmods overlay =overlayfs install_verity_minimal
generate_module_dependencies
inst_binary unsquashfs
install_verity_minimal
)
} }
do_test "$@" do_test "$@"

25
test/TEST-50-DISSECT/test.sh
View file

@ -16,22 +16,17 @@ command -v mksquashfs >/dev/null 2>&1 || exit 0
command -v veritysetup >/dev/null 2>&1 || exit 0 command -v veritysetup >/dev/null 2>&1 || exit 0
command -v sfdisk >/dev/null 2>&1 || exit 0 command -v sfdisk >/dev/null 2>&1 || exit 0
# Need loop devices for systemd-dissect
test_append_files() { test_append_files() {
( instmods squashfs =squashfs
instmods loop =block instmods dm_verity =md
instmods squashfs =squashfs install_dmevent
instmods dm_verity =md generate_module_dependencies
instmods overlay =overlayfs inst_binary wc
install_dmevent inst_binary sha256sum
generate_module_dependencies if command -v openssl >/dev/null 2>&1; then
inst_binary wc inst_binary openssl
inst_binary sha256sum fi
if command -v openssl >/dev/null 2>&1; then install_verity_minimal
inst_binary openssl
fi
install_verity_minimal
)
} }
do_test "$@" do_test "$@"

7
test/test-functions
View file

@ -775,7 +775,6 @@ setup_basic_environment() {
install_testuser install_testuser
has_user_dbus_socket && install_user_dbus has_user_dbus_socket && install_user_dbus
setup_selinux setup_selinux
instmods veth
install_depmod_files install_depmod_files
generate_module_dependencies generate_module_dependencies
if get_bool "$IS_BUILT_WITH_ASAN"; then if get_bool "$IS_BUILT_WITH_ASAN"; then
@ -959,10 +958,10 @@ install_fs_tools() {
install_modules() { install_modules() {
dinfo "Install modules" dinfo "Install modules"
instmods loop instmods dummy vfat veth
instmods vfat instmods loop =block
instmods nls_ascii =nls instmods nls_ascii =nls
instmods dummy instmods overlay =overlayfs
# for TEST-35-LOGIN # for TEST-35-LOGIN
instmods scsi_debug uinput instmods scsi_debug uinput