omit plymouth and add debug module for the testsuite clients

diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
index 94b8152dcbab7bc8821e59ba6e218b219c52964a..0d174b54c0baf149d7e1b72c25e065e6d4f3252c 100755 (executable)
--- a/test/TEST-10-RAID/test.sh
+++ b/test/TEST-10-RAID/test.sh
@@ -63,6 +63,8 @@ test_setup() {
        inst ./cryptroot-ask /sbin/cryptroot-ask
     )
     sudo $basedir/dracut -l -i overlay / \
+       -o "plymouth" \
+       -a "debug" \
        -d "ata_piix ext2 sd_mod" \
        -f initramfs.testing $KVERSION || return 1
 }

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index 68501971fca681e24544121a4e5e58272181012e..369e3942e290b466cb7b4eb05bd356953e8c1226 100755 (executable)
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -276,6 +276,8 @@ test_setup() {
 
     # Make client's dracut image
     $basedir/dracut -l -i overlay / \
+       -o "plymouth" \
+       -a "debug" \
        -d "e1000 nfs sunrpc" \
        -f initramfs.testing $KVERSION || return 1
 }

diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
index a70cdfe1020d998d5ad311160ef633e63fab52a6..8b0239b690ca4d165303befaa9a61b7770c0835c 100755 (executable)
--- a/test/TEST-30-ISCSI/test.sh
+++ b/test/TEST-30-ISCSI/test.sh
@@ -3,7 +3,7 @@ TEST_DESCRIPTION="root filesystem over iSCSI"
 
 KVERSION=${KVERSION-$(uname -r)}
 
-#DEBUGFAIL="rdinitdebug rdnetdebug rdudevinfo"
+#DEBUGFAIL="rdinitdebug rdnetdebug"
 
 run_server() {
     # Start server first
@@ -114,6 +114,8 @@ test_setup() {
 #      inst ./cryptroot-ask /sbin/cryptroot-ask
     )
     sudo $basedir/dracut -l -i overlay / \
+       -o "plymouth dmraid" \
+       -a "debug" \
        -d "ata_piix ext2 sd_mod" \
        -f initramfs.testing $KVERSION || return 1
 

diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
index 26a8dc403337f1e2cd5ab8b6021ac4f2fbee59ab..1ba1933e4834c87299e3c3b75d795576e73ab560 100755 (executable)
--- a/test/TEST-40-NBD/test.sh
+++ b/test/TEST-40-NBD/test.sh
@@ -4,7 +4,7 @@ TEST_DESCRIPTION="root filesystem on NBD"
 KVERSION=${KVERSION-$(uname -r)}
 
 # Uncomment this to debug failures
-#DEBUGFAIL="rdinitdebug rdnetdebug rdbreak"
+#DEBUGFAIL="rdinitdebug rdnetdebug"
 
 run_server() {
     # Start server first
@@ -292,7 +292,8 @@ test_setup() {
        -f initramfs.server $KVERSION || return 1
 
     sudo $basedir/dracut -l -i overlay / \
-        -o "plymouth" \
+       -o "plymouth" \
+       -a "debug" \
        -d "ata_piix ext2 ext3 sd_mod e1000" \
        -f initramfs.testing $KVERSION || return 1
 }