From 249a94ab048586adf4fc80bed05c4bf5cc773fd2 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 1 Mar 2016 12:32:02 +0100 Subject: [PATCH] test: remove dash module, as it is not available in RHEL --- test/TEST-01-BASIC/test.sh | 2 +- test/TEST-03-USR-MOUNT/test.sh | 2 +- test/TEST-10-RAID/test.sh | 2 +- test/TEST-12-RAID-DEG/test.sh | 2 +- test/TEST-14-IMSM/test.sh | 2 +- test/TEST-17-LVM-THIN/test.sh | 2 +- test/TEST-30-ISCSI/test.sh | 2 +- test/TEST-40-NBD/test.sh | 4 ++-- test/TEST-50-MULTINIC/test.sh | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index 642b250..aef0737 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -62,7 +62,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 "udev-rules base rootfs-block fs-lib kernel-modules fs-lib" \ -d "piix ide-gd_mod ata_piix ext3 sd_mod" \ --nomdadmconf \ -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh index e772352..363f8b0 100755 --- a/test/TEST-03-USR-MOUNT/test.sh +++ b/test/TEST-03-USR-MOUNT/test.sh @@ -89,7 +89,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 "udev-rules btrfs base rootfs-block fs-lib kernel-modules" \ -d "piix ide-gd_mod ata_piix btrfs sd_mod" \ --nomdadmconf \ --nohardlink \ diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh index cf474df..45edda2 100755 --- a/test/TEST-10-RAID/test.sh +++ b/test/TEST-10-RAID/test.sh @@ -60,7 +60,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 "crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \ -d "piix ide-gd_mod ata_piix ext2 sd_mod" \ --nomdadmconf \ -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 11f66b2..e749ba0 100755 --- a/test/TEST-12-RAID-DEG/test.sh +++ b/test/TEST-12-RAID-DEG/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 crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \ + -m "crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \ -d "piix ide-gd_mod ata_piix ext2 sd_mod" \ -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 rm -rf -- $TESTDIR/overlay diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh index 9465965..a600e1c 100755 --- a/test/TEST-14-IMSM/test.sh +++ b/test/TEST-14-IMSM/test.sh @@ -86,7 +86,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 "lvm mdraid dmraid udev-rules base rootfs-block fs-lib kernel-modules" \ -d "piix ide-gd_mod ata_piix ext2 sd_mod dm-multipath dm-crypt dm-round-robin faulty linear multipath raid0 raid10 raid1 raid456" \ -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 rm -rf -- $TESTDIR/overlay diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh index 79e224e..dc6e588 100755 --- a/test/TEST-17-LVM-THIN/test.sh +++ b/test/TEST-17-LVM-THIN/test.sh @@ -57,7 +57,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 "lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \ -d "piix ide-gd_mod ata_piix ext2 sd_mod" \ -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 rm -rf -- $TESTDIR/overlay diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh index fc4bdce..65457a5 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -186,7 +186,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 "crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \ -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 abf1a4f..1a6524d 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -226,7 +226,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 "crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \ -d "piix ide-gd_mod ata_piix ext2 ext3 sd_mod" \ -f $TESTDIR/initramfs.makeroot $KVERSION || return 1 rm -rf -- $TESTDIR/overlay @@ -352,7 +352,7 @@ test_setup() { ) sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \ - -m "dash udev-rules rootfs-block fs-lib base debug kernel-modules" \ + -m "udev-rules rootfs-block fs-lib base debug kernel-modules" \ -d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000" \ -f $TESTDIR/initramfs.server $KVERSION || return 1 diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh index 4f73203..1c46d7a 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -264,7 +264,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 "udev-rules base rootfs-block fs-lib debug kernel-modules watchdog" \ -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" \ -f "$TESTDIR"/initramfs.server "$KVERSION" || return 1