From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 21 Apr 2021 07:58:26 +0000 (+0200)
Subject: tests: install mkfs.ext4, mkfs.vfat and modules into the test image
X-Git-Tag: v249-rc1~342^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0dd77c159a7acf76e84ba903b7bec7ea34d90b8c;p=thirdparty%2Fsystemd.git

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

This allows TEST-58-REPART to at least start. It fails later with with loopback
device errors.
---

diff --git a/test/test-functions b/test/test-functions
index 8f2ffb13232..6f11b2f1b27 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -632,7 +632,8 @@ setup_basic_environment() {
     install_keymaps
     install_terminfo
     install_execs
-    install_fsck
+    install_fs_tools
+    install_modules
     install_plymouth
     install_debug_tools
     install_ld_so_conf
@@ -833,13 +834,28 @@ EOF
     chmod 0755 "$strace_wrapper"
 }
 
-install_fsck() {
+install_fs_tools() {
     dinfo "Install fsck"
     dracut_install /sbin/fsck*
     dracut_install -o /bin/fsck*
 
     # fskc.reiserfs calls reiserfsck. so, install it
     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() {
@@ -2220,7 +2236,6 @@ setup_suse() {
     ln -fs ../usr/bin/systemctl "${initdir:?}/bin/"
     ln -fs ../usr/lib/systemd "$initdir/lib/"
     inst_simple "/usr/lib/systemd/system/haveged.service"
-    instmods ext4
 }
 
 _umount_dir() {