test: move more execution to dracut command line

use the -I argument to install dd and mkfs.btrfs
use the -i argument to install the hook
btrfs is already installed by the btrfs dracut module
sfdisk is not used

diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
index 4a1aac133da980c390e301e7677003aeb1c0030a..2a1a4c47b6fa5a9db4c366b6b3463c7dce6189f0 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/test.sh
+++ b/test/TEST-03-USR-MOUNT/test.sh
@@ -34,21 +34,17 @@ client_run() {
         return 1
     fi
     echo "CLIENT TEST END: $test_name [OK]"
-
 }
 
 test_run() {
     client_run "no option specified" || return 1
     client_run "readonly root" "ro" || return 1
     client_run "writeable root" "rw" || return 1
-    return 0
 }
 
 test_setup() {
     # Create what will eventually be our root filesystem onto an overlay
-    mkdir -p -- "$TESTDIR"/overlay/source "$TESTDIR"/overlay/tmp
-
-    "$basedir"/dracut.sh -l --keep --tmpdir "$TESTDIR"/overlay/tmp \
+    "$basedir"/dracut.sh -l --keep --tmpdir "$TESTDIR" \
         -m "test-root" \
         -i ./test-init.sh /sbin/init \
         -i ./fstab /etc/fstab \
@@ -56,25 +52,17 @@ test_setup() {
         -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
+    mkdir -p "$TESTDIR"/overlay/source && mv "$TESTDIR"/dracut.*/initramfs/* "$TESTDIR"/overlay/source && rm -rf "$TESTDIR"/dracut.*
 
     # second, install the files needed to make the root filesystem
-    (
-        # shellcheck disable=SC2031
-        # shellcheck disable=SC2030
-        export initdir=$TESTDIR/overlay
-        # shellcheck disable=SC1090
-        . "$basedir"/dracut-init.sh
-        inst_multiple sfdisk mkfs.btrfs btrfs
-        inst_hook initqueue 01 ./create-root.sh
-    )
-
     # create an initramfs that will create the target root filesystem.
     # We do it this way so that we do not risk trashing the host mdraid
     # devices, volume groups, encrypted partitions, etc.
     "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \
         -m "test-makeroot dash btrfs rootfs-block kernel-modules" \
         -d "piix ide-gd_mod ata_piix btrfs sd_mod" \
+        -I "mkfs.btrfs" \
+        -i ./create-root.sh /lib/dracut/hooks/initqueue/01-create-root.sh \
         --nomdadmconf \
         --nohardlink \
         --no-hostonly-cmdline -N \
@@ -103,20 +91,13 @@ test_setup() {
         return 1
     fi
 
-    (
-        # shellcheck disable=SC2031
-        export initdir=$TESTDIR/overlay
-        # shellcheck disable=SC1090
-        . "$basedir"/dracut-init.sh
-        inst_multiple dd
-    )
     "$basedir"/dracut.sh -l -i "$TESTDIR"/overlay / \
         -a "test watchdog" \
         -o "network kernel-network-modules" \
         -d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esb ib700wdt" \
+        -I "dd" \
         --no-hostonly-cmdline -N \
         -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1
-
     rm -rf -- "$TESTDIR"/overlay
 }