|
 |
a0a3b4 |
From 249a94ab048586adf4fc80bed05c4bf5cc773fd2 Mon Sep 17 00:00:00 2001
|
|
|
a0a3b4 |
From: Harald Hoyer <harald@redhat.com>
|
|
|
a0a3b4 |
Date: Tue, 1 Mar 2016 12:32:02 +0100
|
|
|
a0a3b4 |
Subject: [PATCH] test: remove dash module, as it is not available in RHEL
|
|
|
a0a3b4 |
|
|
|
a0a3b4 |
---
|
|
|
a0a3b4 |
test/TEST-01-BASIC/test.sh | 2 +-
|
|
|
a0a3b4 |
test/TEST-03-USR-MOUNT/test.sh | 2 +-
|
|
|
a0a3b4 |
test/TEST-10-RAID/test.sh | 2 +-
|
|
|
a0a3b4 |
test/TEST-12-RAID-DEG/test.sh | 2 +-
|
|
|
a0a3b4 |
test/TEST-14-IMSM/test.sh | 2 +-
|
|
|
a0a3b4 |
test/TEST-17-LVM-THIN/test.sh | 2 +-
|
|
|
a0a3b4 |
test/TEST-30-ISCSI/test.sh | 2 +-
|
|
|
a0a3b4 |
test/TEST-40-NBD/test.sh | 4 ++--
|
|
|
a0a3b4 |
test/TEST-50-MULTINIC/test.sh | 2 +-
|
|
|
a0a3b4 |
9 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
a0a3b4 |
|
|
|
a0a3b4 |
diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
|
|
|
1755ca |
index 642b250e..aef07373 100755
|
|
|
a0a3b4 |
--- a/test/TEST-01-BASIC/test.sh
|
|
|
a0a3b4 |
+++ b/test/TEST-01-BASIC/test.sh
|
|
|
a0a3b4 |
@@ -62,7 +62,7 @@ test_setup() {
|
|
|
a0a3b4 |
# We do it this way so that we do not risk trashing the host mdraid
|
|
|
a0a3b4 |
# devices, volume groups, encrypted partitions, etc.
|
|
|
a0a3b4 |
$basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
a0a3b4 |
- -m "dash udev-rules base rootfs-block fs-lib kernel-modules fs-lib" \
|
|
|
a0a3b4 |
+ -m "udev-rules base rootfs-block fs-lib kernel-modules fs-lib" \
|
|
|
a0a3b4 |
-d "piix ide-gd_mod ata_piix ext3 sd_mod" \
|
|
|
a0a3b4 |
--nomdadmconf \
|
|
|
a0a3b4 |
-f $TESTDIR/initramfs.makeroot $KVERSION || return 1
|
|
|
a0a3b4 |
diff --git a/test/TEST-03-USR-MOUNT/test.sh b/test/TEST-03-USR-MOUNT/test.sh
|
|
|
1755ca |
index e772352a..363f8b04 100755
|
|
|
a0a3b4 |
--- a/test/TEST-03-USR-MOUNT/test.sh
|
|
|
a0a3b4 |
+++ b/test/TEST-03-USR-MOUNT/test.sh
|
|
|
a0a3b4 |
@@ -89,7 +89,7 @@ test_setup() {
|
|
|
a0a3b4 |
# We do it this way so that we do not risk trashing the host mdraid
|
|
|
a0a3b4 |
# devices, volume groups, encrypted partitions, etc.
|
|
|
a0a3b4 |
$basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
a0a3b4 |
- -m "dash udev-rules btrfs base rootfs-block fs-lib kernel-modules" \
|
|
|
a0a3b4 |
+ -m "udev-rules btrfs base rootfs-block fs-lib kernel-modules" \
|
|
|
a0a3b4 |
-d "piix ide-gd_mod ata_piix btrfs sd_mod" \
|
|
|
a0a3b4 |
--nomdadmconf \
|
|
|
a0a3b4 |
--nohardlink \
|
|
|
a0a3b4 |
diff --git a/test/TEST-10-RAID/test.sh b/test/TEST-10-RAID/test.sh
|
|
|
1755ca |
index cf474dff..45edda2c 100755
|
|
|
a0a3b4 |
--- a/test/TEST-10-RAID/test.sh
|
|
|
a0a3b4 |
+++ b/test/TEST-10-RAID/test.sh
|
|
|
a0a3b4 |
@@ -60,7 +60,7 @@ test_setup() {
|
|
|
a0a3b4 |
# We do it this way so that we do not risk trashing the host mdraid
|
|
|
a0a3b4 |
# devices, volume groups, encrypted partitions, etc.
|
|
|
a0a3b4 |
$basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
a0a3b4 |
- -m "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \
|
|
|
a0a3b4 |
+ -m "crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \
|
|
|
a0a3b4 |
-d "piix ide-gd_mod ata_piix ext2 sd_mod" \
|
|
|
a0a3b4 |
--nomdadmconf \
|
|
|
a0a3b4 |
-f $TESTDIR/initramfs.makeroot $KVERSION || return 1
|
|
|
a0a3b4 |
diff --git a/test/TEST-12-RAID-DEG/test.sh b/test/TEST-12-RAID-DEG/test.sh
|
|
|
1755ca |
index 11f66b23..e749ba0c 100755
|
|
|
a0a3b4 |
--- a/test/TEST-12-RAID-DEG/test.sh
|
|
|
a0a3b4 |
+++ b/test/TEST-12-RAID-DEG/test.sh
|
|
|
a0a3b4 |
@@ -98,7 +98,7 @@ test_setup() {
|
|
|
a0a3b4 |
# We do it this way so that we do not risk trashing the host mdraid
|
|
|
a0a3b4 |
# devices, volume groups, encrypted partitions, etc.
|
|
|
a0a3b4 |
$basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
a0a3b4 |
- -m "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \
|
|
|
a0a3b4 |
+ -m "crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \
|
|
|
a0a3b4 |
-d "piix ide-gd_mod ata_piix ext2 sd_mod" \
|
|
|
a0a3b4 |
-f $TESTDIR/initramfs.makeroot $KVERSION || return 1
|
|
|
a0a3b4 |
rm -rf -- $TESTDIR/overlay
|
|
|
a0a3b4 |
diff --git a/test/TEST-14-IMSM/test.sh b/test/TEST-14-IMSM/test.sh
|
|
|
1755ca |
index 9465965c..a600e1c0 100755
|
|
|
a0a3b4 |
--- a/test/TEST-14-IMSM/test.sh
|
|
|
a0a3b4 |
+++ b/test/TEST-14-IMSM/test.sh
|
|
|
a0a3b4 |
@@ -86,7 +86,7 @@ test_setup() {
|
|
|
a0a3b4 |
# We do it this way so that we do not risk trashing the host mdraid
|
|
|
a0a3b4 |
# devices, volume groups, encrypted partitions, etc.
|
|
|
a0a3b4 |
$basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
a0a3b4 |
- -m "dash lvm mdraid dmraid udev-rules base rootfs-block fs-lib kernel-modules" \
|
|
|
a0a3b4 |
+ -m "lvm mdraid dmraid udev-rules base rootfs-block fs-lib kernel-modules" \
|
|
|
a0a3b4 |
-d "piix ide-gd_mod ata_piix ext2 sd_mod dm-multipath dm-crypt dm-round-robin faulty linear multipath raid0 raid10 raid1 raid456" \
|
|
|
a0a3b4 |
-f $TESTDIR/initramfs.makeroot $KVERSION || return 1
|
|
|
a0a3b4 |
rm -rf -- $TESTDIR/overlay
|
|
|
a0a3b4 |
diff --git a/test/TEST-17-LVM-THIN/test.sh b/test/TEST-17-LVM-THIN/test.sh
|
|
|
1755ca |
index 79e224e2..dc6e5885 100755
|
|
|
a0a3b4 |
--- a/test/TEST-17-LVM-THIN/test.sh
|
|
|
a0a3b4 |
+++ b/test/TEST-17-LVM-THIN/test.sh
|
|
|
a0a3b4 |
@@ -57,7 +57,7 @@ test_setup() {
|
|
|
a0a3b4 |
# We do it this way so that we do not risk trashing the host mdraid
|
|
|
a0a3b4 |
# devices, volume groups, encrypted partitions, etc.
|
|
|
a0a3b4 |
$basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
a0a3b4 |
- -m "dash lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \
|
|
|
a0a3b4 |
+ -m "lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \
|
|
|
a0a3b4 |
-d "piix ide-gd_mod ata_piix ext2 sd_mod" \
|
|
|
a0a3b4 |
-f $TESTDIR/initramfs.makeroot $KVERSION || return 1
|
|
|
a0a3b4 |
rm -rf -- $TESTDIR/overlay
|
|
|
a0a3b4 |
diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
|
|
|
1755ca |
index fc4bdce9..65457a5a 100755
|
|
|
a0a3b4 |
--- a/test/TEST-30-ISCSI/test.sh
|
|
|
a0a3b4 |
+++ b/test/TEST-30-ISCSI/test.sh
|
|
|
a0a3b4 |
@@ -186,7 +186,7 @@ test_setup() {
|
|
|
a0a3b4 |
# We do it this way so that we do not risk trashing the host mdraid
|
|
|
a0a3b4 |
# devices, volume groups, encrypted partitions, etc.
|
|
|
a0a3b4 |
$basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
a0a3b4 |
- -m "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \
|
|
|
a0a3b4 |
+ -m "crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \
|
|
|
a0a3b4 |
-d "piix ide-gd_mod ata_piix ext3 sd_mod" \
|
|
|
a0a3b4 |
--no-hostonly-cmdline -N \
|
|
|
a0a3b4 |
-f $TESTDIR/initramfs.makeroot $KVERSION || return 1
|
|
|
a0a3b4 |
diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh
|
|
|
1755ca |
index abf1a4f4..1a6524de 100755
|
|
|
a0a3b4 |
--- a/test/TEST-40-NBD/test.sh
|
|
|
a0a3b4 |
+++ b/test/TEST-40-NBD/test.sh
|
|
|
a0a3b4 |
@@ -226,7 +226,7 @@ make_encrypted_root() {
|
|
|
a0a3b4 |
# We do it this way so that we do not risk trashing the host mdraid
|
|
|
a0a3b4 |
# devices, volume groups, encrypted partitions, etc.
|
|
|
a0a3b4 |
$basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
a0a3b4 |
- -m "dash crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \
|
|
|
a0a3b4 |
+ -m "crypt lvm mdraid udev-rules base rootfs-block fs-lib kernel-modules" \
|
|
|
a0a3b4 |
-d "piix ide-gd_mod ata_piix ext2 ext3 sd_mod" \
|
|
|
a0a3b4 |
-f $TESTDIR/initramfs.makeroot $KVERSION || return 1
|
|
|
a0a3b4 |
rm -rf -- $TESTDIR/overlay
|
|
|
a0a3b4 |
@@ -352,7 +352,7 @@ test_setup() {
|
|
|
a0a3b4 |
)
|
|
|
a0a3b4 |
|
|
|
a0a3b4 |
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
a0a3b4 |
- -m "dash udev-rules rootfs-block fs-lib base debug kernel-modules" \
|
|
|
a0a3b4 |
+ -m "udev-rules rootfs-block fs-lib base debug kernel-modules" \
|
|
|
a0a3b4 |
-d "af_packet piix ide-gd_mod ata_piix ext2 ext3 sd_mod e1000" \
|
|
|
a0a3b4 |
-f $TESTDIR/initramfs.server $KVERSION || return 1
|
|
|
a0a3b4 |
|
|
|
a0a3b4 |
diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh
|
|
|
1755ca |
index 4f73203f..1c46d7a8 100755
|
|
|
a0a3b4 |
--- a/test/TEST-50-MULTINIC/test.sh
|
|
|
a0a3b4 |
+++ b/test/TEST-50-MULTINIC/test.sh
|
|
|
a0a3b4 |
@@ -264,7 +264,7 @@ test_setup() {
|
|
|
a0a3b4 |
|
|
|
a0a3b4 |
# Make server's dracut image
|
|
|
a0a3b4 |
$basedir/dracut.sh -l -i "$TESTDIR"/overlay / \
|
|
|
a0a3b4 |
- -m "dash udev-rules base rootfs-block fs-lib debug kernel-modules watchdog" \
|
|
|
a0a3b4 |
+ -m "udev-rules base rootfs-block fs-lib debug kernel-modules watchdog" \
|
|
|
a0a3b4 |
-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" \
|
|
|
a0a3b4 |
-f "$TESTDIR"/initramfs.server "$KVERSION" || return 1
|
|
|
a0a3b4 |
|