test: use hosts randomness, not rngd

diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
index ca4a8288f9d18b654998035b4d94387373436dcd..a88843d3256fac8dd61721e6a857287fab812509 100755 (executable)
--- a/test/TEST-01-BASIC/test.sh
+++ b/test/TEST-01-BASIC/test.sh
@@ -70,7 +70,7 @@ test_setup() {
     # 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 "dash udev-rules base rootfs-block fs-lib kernel-modules fs-lib" \
+       -m "dash udev-rules base rootfs-block fs-lib kernel-modules fs-lib qemu" \
        -d "piix ide-gd_mod ata_piix ext3 sd_mod" \
         --nomdadmconf \
         --no-hostonly-cmdline -N \

diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
index 848021e586284d004edf3b32b1c826c2ab0bf7f1..c5739a70abe01ece0a282de6d9e3ed3f8dd2413d 100755 (executable)
--- a/test/TEST-02-SYSTEMD/test.sh
+++ b/test/TEST-02-SYSTEMD/test.sh
@@ -67,7 +67,7 @@ test_setup() {
     # 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 "dash udev-rules base rootfs-block fs-lib kernel-modules" \
+        -m "dash udev-rules base rootfs-block fs-lib kernel-modules qemu" \
         -d "piix ide-gd_mod ata_piix ext3 sd_mod" \
         --nomdadmconf \
         --no-hostonly-cmdline -N \

diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
index 5d5ec8f83cb24a78c49a45b6381b1481082da718..dffcc0a4c8323cf7d2ce97ee4f6c1c0f4099261f 100755 (executable)
--- a/test/TEST-03-USR-MOUNT/test.sh
+++ b/test/TEST-03-USR-MOUNT/test.sh
@@ -98,7 +98,7 @@ test_setup() {
     # 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 "dash udev-rules btrfs base rootfs-block fs-lib kernel-modules" \
+       -m "dash udev-rules btrfs base rootfs-block fs-lib kernel-modules qemu" \
        -d "piix ide-gd_mod ata_piix btrfs sd_mod" \
         --nomdadmconf \
         --nohardlink \

diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
index 6b4d9c47f71c3d6f2963fe534c56611e179f4d5b..1fcbeeb854f2128d8708664377088b78598ab9eb 100755 (executable)
--- a/test/TEST-04-FULL-SYSTEMD/test.sh
+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
@@ -238,7 +238,7 @@ EOF
     # 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 "dash udev-rules btrfs base rootfs-block fs-lib kernel-modules" \
+       -m "dash udev-rules btrfs base rootfs-block fs-lib kernel-modules qemu" \
        -d "piix ide-gd_mod ata_piix btrfs sd_mod" \
         --nomdadmconf \
         --nohardlink \
@@ -270,9 +270,9 @@ EOF
     [ -e /etc/machine-info ] && EXTRA_MACHINE+=" /etc/machine-info"
 
     sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-       -a "debug systemd i18n" \
+       -a "debug systemd i18n qemu" \
        ${EXTRA_MACHINE:+-I "$EXTRA_MACHINE"} \
-        -o "dash network plymouth lvm mdraid resume crypt caps dm terminfo usrmount kernel-network-modules" \
+        -o "dash network plymouth lvm mdraid resume crypt caps dm terminfo usrmount kernel-network-modules rngd" \
        -d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esb ib700wdt" \
         --no-hostonly-cmdline -N \
        -f $TESTDIR/initramfs.testing $KVERSION || return 1

diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
index 07179a2992d0ccec658c648ef8b374995fa57d60..a760143afbca0ddf1d5dd9103aae7977fceafbc4 100755 (executable)
--- a/test/TEST-10-RAID/test.sh
+++ b/test/TEST-10-RAID/test.sh
@@ -68,7 +68,7 @@ test_setup() {
     # 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 "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \
+       -m "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules qemu" \
        -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
         --nomdadmconf \
         --no-hostonly-cmdline -N \

diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
index a907c4b1197828c694cef1ead0413eccf0c66500..71e8cd29e9b7438bf9ef194b1043d92f65a621d2 100755 (executable)
--- a/test/TEST-11-LVM/test.sh
+++ b/test/TEST-11-LVM/test.sh
@@ -66,7 +66,7 @@ test_setup() {
     # 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 "dash lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \
+       -m "dash lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules qemu" \
        -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
         --no-hostonly-cmdline -N \
        -f $TESTDIR/initramfs.makeroot $KVERSION || return 1

diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
index 920baafd3908dacfecffb5eed77e9ebd8f9b2b0e..27274191456b74a3a74424b7f4e0d20b9931da97 100755 (executable)
--- a/test/TEST-12-RAID-DEG/test.sh
+++ b/test/TEST-12-RAID-DEG/test.sh
@@ -106,7 +106,7 @@ test_setup() {
     # 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 "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \
+                       -m "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules qemu" \
                        -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
                        --no-hostonly-cmdline -N \
                        -f $TESTDIR/initramfs.makeroot $KVERSION || return 1

diff --git a/test/TEST-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
index 145c23dda9327931f7d30908788414b707873d65..edb711867a4a1fdb1f6565a04aa07b9582e8f8f2 100755 (executable)
--- a/test/TEST-13-ENC-RAID-LVM/test.sh
+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
@@ -105,7 +105,7 @@ test_setup() {
     # 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 "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \
+       -m "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules qemu" \
        -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
         --no-hostonly-cmdline -N \
        -f $TESTDIR/initramfs.makeroot $KVERSION || return 1

diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh
index a3e52b5335faf403faee8cca1fd003a03ee38f37..40ca132e0e82b1e2e62908011b704c4e65dde109 100755 (executable)
--- a/test/TEST-14-IMSM/test.sh
+++ b/test/TEST-14-IMSM/test.sh
@@ -99,7 +99,7 @@ test_setup() {
     # 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 "dash lvm mdraid dmraid udev-rules base rootfs-block fs-lib kernel-modules" \
+       -m "dash lvm mdraid dmraid udev-rules base rootfs-block fs-lib kernel-modules qemu" \
        -d "piix ide-gd_mod ata_piix ext2 sd_mod dm-multipath dm-crypt dm-round-robin faulty linear multipath raid0 raid10 raid1 raid456" \
         --no-hostonly-cmdline -N \
        -f $TESTDIR/initramfs.makeroot $KVERSION || return 1

diff --git a/test/TEST-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
index dda766725f08db1f49ed2619b38c35ec1b658918..cad641e46c1f18f6752a5f7bdb269d99d78bc168 100755 (executable)
--- a/test/TEST-15-BTRFSRAID/test.sh
+++ b/test/TEST-15-BTRFSRAID/test.sh
@@ -70,7 +70,7 @@ test_setup() {
     # 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 "dash btrfs udev-rules base rootfs-block fs-lib kernel-modules" \
+       -m "dash btrfs udev-rules base rootfs-block fs-lib kernel-modules qemu" \
        -d "piix ide-gd_mod ata_piix btrfs sd_mod" \
         --nomdadmconf \
         --no-hostonly-cmdline -N \

diff --git a/test/TEST-16-DMSQUASH/test.sh b/test/TEST-16-DMSQUASH/test.sh
index 2f8994b71d985ce0e1f2a49c37ef1fa924a5f5fd..f244ba1d453a88733b9852acde76706d0d725028 100755 (executable)
--- a/test/TEST-16-DMSQUASH/test.sh
+++ b/test/TEST-16-DMSQUASH/test.sh
@@ -55,7 +55,8 @@ test_setup() {
     dd if=/dev/zero of="$TESTDIR"/root.img count=100
 
     sudo $basedir/dracut.sh -l -i "$TESTDIR"/overlay / \
-       -a "debug dmsquash-live" \
+       -a "debug dmsquash-live qemu" \
+        -o "rngd" \
        -d "piix ide-gd_mod ata_piix ext3 sd_mod" \
         --no-hostonly-cmdline -N \
        -f "$TESTDIR"/initramfs.testing "$KVERSION" || return 1

diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh
index c7247c917fe1d96087506758d4bdb1b231693cbe..8203b0f5179111ca09955a1268b3a85a42c1d57b 100755 (executable)
--- a/test/TEST-17-LVM-THIN/test.sh
+++ b/test/TEST-17-LVM-THIN/test.sh
@@ -66,7 +66,7 @@ test_setup() {
     # 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 "dash lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \
+       -m "dash lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules qemu" \
        -d "piix ide-gd_mod ata_piix ext2 sd_mod" \
         --no-hostonly-cmdline -N \
        -f $TESTDIR/initramfs.makeroot $KVERSION || return 1

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index b28337176f03e2e11aba64342a0e05889d8f1177..97ee5e7b1b7b3bc96356dc6aa6e0d2bce3083fa3 100755 (executable)
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -347,7 +347,7 @@ test_setup() {
 
     # Make server's dracut image
     $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-        -m "dash udev-rules base rootfs-block fs-lib debug kernel-modules watchdog" \
+        -m "dash udev-rules base rootfs-block fs-lib debug kernel-modules watchdog qemu" \
         -d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod e1000 i6300esb" \
         --no-hostonly-cmdline -N \
         -f $TESTDIR/initramfs.server $KVERSION || return 1

diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
index ae322126b766339c4ac3678f21aa1e9cab9c4dab..e909d3730a7cfe60af40a69409a00f91bc31a04f 100755 (executable)
--- a/test/TEST-30-ISCSI/test.sh
+++ b/test/TEST-30-ISCSI/test.sh
@@ -160,7 +160,7 @@ test_setup() {
     # 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 "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \
+        -m "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules qemu" \
         -d "piix ide-gd_mod ata_piix ext3 sd_mod" \
         --no-hostonly-cmdline -N \
         -f $TESTDIR/initramfs.makeroot $KVERSION || return 1

diff --git a/test/TEST-31-ISCSI-MULTI/test.sh b/test/TEST-31-ISCSI-MULTI/test.sh
index 122c69e3a3f629272d5393607a08a055dc75d800..c9df0fb39a2deeebd7f16574027639b75a547f42 100755 (executable)
--- a/test/TEST-31-ISCSI-MULTI/test.sh
+++ b/test/TEST-31-ISCSI-MULTI/test.sh
@@ -175,7 +175,7 @@ test_setup() {
     # 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 "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \
+        -m "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules qemu" \
         -d "piix ide-gd_mod ata_piix ext3 sd_mod" \
         --no-hostonly-cmdline -N \
         -f $TESTDIR/initramfs.makeroot $KVERSION || return 1

diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
index 19ec5b0eded88fed94ae98163d9983a215d477b7..b53992bcc2465b6284641f5e8ab19cbf1e48aee3 100755 (executable)
--- a/test/TEST-40-NBD/test.sh
+++ b/test/TEST-40-NBD/test.sh
@@ -246,7 +246,7 @@ make_encrypted_root() {
     # 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 "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \
+                       -m "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules qemu" \
                        -d "piix ide-gd_mod ata_piix ext2 ext3 sd_mod" \
                        --no-hostonly-cmdline -N \
                        -f $TESTDIR/initramfs.makeroot $KVERSION || return 1

diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
index fa7526380b2a1709a58955b3055330f40a06d627..22739071c800fb17b3c7767a903042264af36762 100755 (executable)
--- a/test/TEST-50-MULTINIC/test.sh
+++ b/test/TEST-50-MULTINIC/test.sh
@@ -287,7 +287,7 @@ test_setup() {
     # Make server's dracut image
     $basedir/dracut.sh \
         -l -i "$TESTDIR"/overlay / \
-        -m "dash udev-rules base rootfs-block fs-lib debug kernel-modules watchdog" \
+        -m "dash udev-rules base rootfs-block fs-lib debug kernel-modules watchdog qemu" \
         -d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files nfsd e1000 i6300esb ib700wdt" \
         --no-hostonly-cmdline -N \
         -f "$TESTDIR"/initramfs.server "$KVERSION" || return 1

diff --git a/test/TEST-60-IFCFG/test.sh b/test/TEST-60-IFCFG/test.sh
index 73dc109e8ac50223477252d5f60753501309f9c4..a766443bdeea6f04604b765adc6cacc74d1fc79e 100755 (executable)
--- a/test/TEST-60-IFCFG/test.sh
+++ b/test/TEST-60-IFCFG/test.sh
@@ -308,7 +308,7 @@ test_setup() {
     # Make server's dracut image
     $basedir/dracut.sh -l -i "$TESTDIR"/overlay / \
         --no-early-microcode \
-        -m "udev-rules base rootfs-block fs-lib debug kernel-modules watchdog" \
+        -m "udev-rules base rootfs-block fs-lib debug kernel-modules watchdog qemu" \
         -d "ipvlan macvlan af_packet piix ide-gd_mod ata_piix ext3 sd_mod nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files nfsd e1000 i6300esb ib700wdt" \
         --no-hostonly-cmdline -N \
         -f "$TESTDIR"/initramfs.server "$KVERSION" || return 1

diff --git a/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh b/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
index 62582c31f45d590c117a53a2a6c6b229249c6b3a..5cb88782268f962cb7b8e4498f69a02a1e273808 100755 (executable)
--- a/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
+++ b/test/TEST-70-BONDBRIDGETEAMVLAN/test.sh
@@ -308,7 +308,7 @@ test_setup() {
     # Make server's dracut image
     $basedir/dracut.sh -l -i "$TESTDIR"/overlay / \
         --no-early-microcode \
-        -m "udev-rules base rootfs-block fs-lib debug kernel-modules watchdog" \
+        -m "udev-rules base rootfs-block fs-lib debug kernel-modules watchdog qemu" \
         -d "ipvlan macvlan af_packet piix ide-gd_mod ata_piix ext3 sd_mod nfsv2 nfsv3 nfsv4 nfs_acl nfs_layout_nfsv41_files nfsd e1000 i6300esb ib700wdt" \
         --no-hostonly-cmdline -N \
         -f "$TESTDIR"/initramfs.server "$KVERSION" || return 1