test: install debug module into what test case is booting into

This will also make some of the non-essential tools optional
instead of a hard dependency.

diff --git a/modules.d/80test-root/module-setup.sh b/modules.d/80test-root/module-setup.sh
index 36635bad250f326b43154d7312cb389b5160aaa9..b8f35c648d5d9f6e1ffded89a70f9ec9234578e3 100755 (executable)
--- a/modules.d/80test-root/module-setup.sh
+++ b/modules.d/80test-root/module-setup.sh
@@ -5,6 +5,10 @@ check() {
     return 255
 }
 
+depends() {
+    echo "debug"
+}
+
 install() {
     inst_simple /etc/os-release
 

diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
index 27fd3e60d021f4b3cbff424a437217030992e84f..f1b8e209fae841ef9795357bc30ca0391ee6dbd5 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/test.sh
+++ b/test/TEST-03-USR-MOUNT/test.sh
@@ -64,8 +64,7 @@ test_setup() {
 
         mv "$TESTDIR"/overlay/tmp/dracut.*/initramfs/* "$initdir" && rm -rf "$TESTDIR"/overlay/tmp
 
-        inst_multiple sh df free ls cat ps \
-            dmesg cp umount strace less setsid sync grep df
+        inst_multiple sh dmesg umount strace setsid sync
 
         inst_simple ./fstab /etc/fstab
         find_binary plymouth > /dev/null && inst_multiple plymouth