Browse Source

test: use hosts randomness, not rngd

master
Daniel Molkentin 5 years ago committed by Harald Hoyer
parent
commit
8996d3dfcd
  1. 2
      test/TEST-01-BASIC/test.sh
  2. 2
      test/TEST-02-SYSTEMD/test.sh
  3. 2
      test/TEST-03-USR-MOUNT/test.sh
  4. 6
      test/TEST-04-FULL-SYSTEMD/test.sh
  5. 2
      test/TEST-10-RAID/test.sh
  6. 2
      test/TEST-11-LVM/test.sh
  7. 2
      test/TEST-12-RAID-DEG/test.sh
  8. 2
      test/TEST-13-ENC-RAID-LVM/test.sh
  9. 2
      test/TEST-14-IMSM/test.sh
  10. 2
      test/TEST-15-BTRFSRAID/test.sh
  11. 3
      test/TEST-16-DMSQUASH/test.sh
  12. 2
      test/TEST-17-LVM-THIN/test.sh
  13. 2
      test/TEST-20-NFS/test.sh
  14. 2
      test/TEST-30-ISCSI/test.sh
  15. 2
      test/TEST-31-ISCSI-MULTI/test.sh
  16. 2
      test/TEST-40-NBD/test.sh
  17. 2
      test/TEST-50-MULTINIC/test.sh
  18. 2
      test/TEST-60-IFCFG/test.sh
  19. 2
      test/TEST-70-BONDBRIDGETEAMVLAN/test.sh

2
test/TEST-01-BASIC/test.sh

@ -70,7 +70,7 @@ test_setup() { @@ -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 \

2
test/TEST-02-SYSTEMD/test.sh

@ -67,7 +67,7 @@ test_setup() { @@ -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 \

2
test/TEST-03-USR-MOUNT/test.sh

@ -98,7 +98,7 @@ test_setup() { @@ -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 \

6
test/TEST-04-FULL-SYSTEMD/test.sh

@ -238,7 +238,7 @@ EOF @@ -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 @@ -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

2
test/TEST-10-RAID/test.sh

@ -68,7 +68,7 @@ test_setup() { @@ -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 \

2
test/TEST-11-LVM/test.sh

@ -66,7 +66,7 @@ test_setup() { @@ -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

2
test/TEST-12-RAID-DEG/test.sh

@ -106,7 +106,7 @@ test_setup() { @@ -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

2
test/TEST-13-ENC-RAID-LVM/test.sh

@ -105,7 +105,7 @@ test_setup() { @@ -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

2
test/TEST-14-IMSM/test.sh

@ -99,7 +99,7 @@ test_setup() { @@ -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

2
test/TEST-15-BTRFSRAID/test.sh

@ -70,7 +70,7 @@ test_setup() { @@ -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 \

3
test/TEST-16-DMSQUASH/test.sh

@ -55,7 +55,8 @@ test_setup() { @@ -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

2
test/TEST-17-LVM-THIN/test.sh

@ -66,7 +66,7 @@ test_setup() { @@ -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

2
test/TEST-20-NFS/test.sh

@ -347,7 +347,7 @@ test_setup() { @@ -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

2
test/TEST-30-ISCSI/test.sh

@ -160,7 +160,7 @@ test_setup() { @@ -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

2
test/TEST-31-ISCSI-MULTI/test.sh

@ -175,7 +175,7 @@ test_setup() { @@ -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

2
test/TEST-40-NBD/test.sh

@ -246,7 +246,7 @@ make_encrypted_root() { @@ -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

2
test/TEST-50-MULTINIC/test.sh

@ -287,7 +287,7 @@ test_setup() { @@ -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

2
test/TEST-60-IFCFG/test.sh

@ -308,7 +308,7 @@ test_setup() { @@ -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

2
test/TEST-70-BONDBRIDGETEAMVLAN/test.sh

@ -308,7 +308,7 @@ test_setup() { @@ -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

Loading…
Cancel
Save