test: move more common dependencies from test case to test-root module

umount setsid sync binaries are used in all test cases to build rootfs

diff --git a/modules.d/80test-root/module-setup.sh b/modules.d/80test-root/module-setup.sh
index a360a659b75430c0bca007e403f50252c607d1d1..24605c51f18fe4a989417d27267e764f69c27807 100755 (executable)
--- a/modules.d/80test-root/module-setup.sh
+++ b/modules.d/80test-root/module-setup.sh
@@ -12,7 +12,7 @@ depends() {
 install() {
     inst_simple /etc/os-release
 
-    inst_multiple mkdir ln dd stty mount poweroff
+    inst_multiple mkdir ln dd stty mount poweroff umount setsid sync
 
     for _terminfodir in /lib/terminfo /etc/terminfo /usr/share/terminfo; do
         [ -f ${_terminfodir}/l/linux ] && break

diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
index db2a312bc93815168d3212df3718244ad8db58a0..4a1aac133da980c390e301e7677003aeb1c0030a 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/test.sh
+++ b/test/TEST-03-USR-MOUNT/test.sh
@@ -46,26 +46,17 @@ test_run() {
 
 test_setup() {
     # Create what will eventually be our root filesystem onto an overlay
-    (
-        # shellcheck disable=SC2030
-        export initdir=$TESTDIR/overlay/source
-        mkdir -p -- "$initdir" "$TESTDIR"/overlay/tmp
-        # shellcheck disable=SC1090
-        . "$basedir"/dracut-init.sh
-
-        "$basedir"/dracut.sh -l --keep --tmpdir "$TESTDIR"/overlay/tmp \
-            -m "test-root" \
-            -i ./test-init.sh /sbin/init \
-            -i ./fstab /etc/fstab \
-            -i "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" \
-            -i "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" \
-            --no-hostonly --no-hostonly-cmdline --nomdadmconf --nohardlink \
-            -f "$TESTDIR"/initramfs.root "$KVERSION" || return 1
-
-        mv "$TESTDIR"/overlay/tmp/dracut.*/initramfs/* "$initdir" && rm -rf "$TESTDIR"/overlay/tmp
-
-        inst_multiple sh umount setsid sync
-    )
+    mkdir -p -- "$TESTDIR"/overlay/source "$TESTDIR"/overlay/tmp
+
+    "$basedir"/dracut.sh -l --keep --tmpdir "$TESTDIR"/overlay/tmp \
+        -m "test-root" \
+        -i ./test-init.sh /sbin/init \
+        -i ./fstab /etc/fstab \
+        -i "${basedir}/modules.d/99base/dracut-lib.sh" "/lib/dracut-lib.sh" \
+        -i "${basedir}/modules.d/99base/dracut-dev-lib.sh" "/lib/dracut-dev-lib.sh" \
+        --no-hostonly --no-hostonly-cmdline --nomdadmconf --nohardlink \
+        -f "$TESTDIR"/initramfs.root "$KVERSION" || return 1
+    mv "$TESTDIR"/overlay/tmp/dracut.*/initramfs/* "$TESTDIR"/overlay/source && rm -rf "$TESTDIR"/overlay/tmp
 
     # second, install the files needed to make the root filesystem
     (