shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-02 13:47:27 +03:00
Code

tests: install mkfs.ext4, mkfs.vfat and modules into the test image

Browse Source 
This allows TEST-58-REPART to at least start. It fails later with with loopback
device errors.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-04-21 09:58:26 +02:00
parent 30f56248f5
commit 0dd77c159a
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/test-functions
View File

@ -632,7 +632,8 @@ setup_basic_environment() {
install_keymaps install_keymaps
install_terminfo install_terminfo
install_execs install_execs
install_fsck install_fs_tools
install_modules
install_plymouth install_plymouth
install_debug_tools install_debug_tools
install_ld_so_conf install_ld_so_conf
@ -833,13 +834,28 @@ EOF
chmod 0755 "$strace_wrapper" chmod 0755 "$strace_wrapper"
} }
install_fsck() { install_fs_tools() {
dinfo "Install fsck" dinfo "Install fsck"
dracut_install /sbin/fsck* dracut_install /sbin/fsck*
dracut_install -o /bin/fsck* dracut_install -o /bin/fsck*
# fskc.reiserfs calls reiserfsck. so, install it # fskc.reiserfs calls reiserfsck. so, install it
dracut_install -o reiserfsck dracut_install -o reiserfsck
# we use mkfs in system-repart tests
dracut_install /sbin/mkfs.ext4
dracut_install /sbin/mkfs.vfat
}
install_modules() {
dinfo "Install modules"
instmods loop
instmods vfat
if [[ "$LOOKS_LIKE_SUSE" ]]; then
instmods ext4
fi
} }
install_dmevent() { install_dmevent() {
@ -2220,7 +2236,6 @@ setup_suse() {
ln -fs ../usr/bin/systemctl "${initdir:?}/bin/" ln -fs ../usr/bin/systemctl "${initdir:?}/bin/"
ln -fs ../usr/lib/systemd "$initdir/lib/" ln -fs ../usr/lib/systemd "$initdir/lib/"
inst_simple "/usr/lib/systemd/system/haveged.service" inst_simple "/usr/lib/systemd/system/haveged.service"
instmods ext4
} }
_umount_dir() { _umount_dir() {