From 8996d3dfcd39d491d5903692f871a71d6b34cc53 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Tue, 12 Nov 2019 15:41:54 +0100 Subject: [PATCH] test: use hosts randomness, not rngd --- test/TEST-01-BASIC/test.sh | 2 +- test/TEST-02-SYSTEMD/test.sh | 2 +- test/TEST-03-USR-MOUNT/test.sh | 2 +- test/TEST-04-FULL-SYSTEMD/test.sh | 6 +++--- test/TEST-10-RAID/test.sh | 2 +- test/TEST-11-LVM/test.sh | 2 +- test/TEST-12-RAID-DEG/test.sh | 2 +- test/TEST-13-ENC-RAID-LVM/test.sh | 2 +- test/TEST-14-IMSM/test.sh | 2 +- test/TEST-15-BTRFSRAID/test.sh | 2 +- test/TEST-16-DMSQUASH/test.sh | 3 ++- test/TEST-17-LVM-THIN/test.sh | 2 +- test/TEST-20-NFS/test.sh | 2 +- test/TEST-30-ISCSI/test.sh | 2 +- test/TEST-31-ISCSI-MULTI/test.sh | 2 +- test/TEST-40-NBD/test.sh | 2 +- test/TEST-50-MULTINIC/test.sh | 2 +- test/TEST-60-IFCFG/test.sh | 2 +- test/TEST-70-BONDBRIDGETEAMVLAN/test.sh | 2 +- 19 files changed, 22 insertions(+), 21 deletions(-) diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index ca4a8288..a88843d3 100755 --- 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 848021e5..c5739a70 100755 --- 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 5d5ec8f8..dffcc0a4 100755 --- 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 6b4d9c47..1fcbeeb8 100755 --- 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 07179a29..a760143a 100755 --- 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 a907c4b1..71e8cd29 100755 --- 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 920baafd..27274191 100755 --- 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 145c23dd..edb71186 100755 --- 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 a3e52b53..40ca132e 100755 --- 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 dda76672..cad641e4 100755 --- 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 2f8994b7..f244ba1d 100755 --- 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 c7247c91..8203b0f5 100755 --- 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 b2833717..97ee5e7b 100755 --- 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 ae322126..e909d373 100755 --- 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 122c69e3..c9df0fb3 100755 --- 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 19ec5b0e..b53992bc 100755 --- 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 fa752638..22739071 100755 --- 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 73dc109e..a766443b 100755 --- 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 62582c31..5cb88782 100755 --- 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