|
 |
a0a3b4 |
From b14e0fb8267de59618dbfe4db79b12dcced6b1ec Mon Sep 17 00:00:00 2001
|
|
|
a0a3b4 |
From: Harald Hoyer <harald@redhat.com>
|
|
|
a0a3b4 |
Date: Tue, 1 Mar 2016 13:38:05 +0100
|
|
|
a0a3b4 |
Subject: [PATCH] more dash removal
|
|
|
a0a3b4 |
|
|
|
a0a3b4 |
---
|
|
|
a0a3b4 |
test/TEST-02-SYSTEMD/test.sh | 2 +-
|
|
|
a0a3b4 |
test/TEST-04-FULL-SYSTEMD/test.sh | 4 ++--
|
|
|
a0a3b4 |
test/TEST-11-LVM/test.sh | 2 +-
|
|
|
a0a3b4 |
test/TEST-13-ENC-RAID-LVM/test.sh | 2 +-
|
|
|
a0a3b4 |
test/TEST-15-BTRFSRAID/test.sh | 2 +-
|
|
|
a0a3b4 |
test/TEST-20-NFS/test.sh | 4 ++--
|
|
|
a0a3b4 |
test/TEST-30-ISCSI/test.sh | 4 ++--
|
|
|
a0a3b4 |
7 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
a0a3b4 |
|
|
|
a0a3b4 |
diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
|
|
|
1755ca |
index 4ebff837..47268b0e 100755
|
|
|
a0a3b4 |
--- a/test/TEST-02-SYSTEMD/test.sh
|
|
|
a0a3b4 |
+++ b/test/TEST-02-SYSTEMD/test.sh
|
|
|
a0a3b4 |
@@ -58,7 +58,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" \
|
|
|
a0a3b4 |
+ -m "udev-rules base rootfs-block fs-lib kernel-modules" \
|
|
|
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-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
|
|
|
1755ca |
index 38342386..01b406d0 100755
|
|
|
a0a3b4 |
--- a/test/TEST-04-FULL-SYSTEMD/test.sh
|
|
|
a0a3b4 |
+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
|
|
|
a0a3b4 |
@@ -232,7 +232,7 @@ EOF
|
|
|
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 |
@@ -264,7 +264,7 @@ EOF
|
|
|
a0a3b4 |
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
a0a3b4 |
-a "debug systemd" \
|
|
|
a0a3b4 |
-I "/etc/machine-id /etc/hostname" \
|
|
|
a0a3b4 |
- -o "dash network plymouth lvm mdraid resume crypt i18n caps dm terminfo usrmount" \
|
|
|
a0a3b4 |
+ -o "network plymouth lvm mdraid resume crypt i18n caps dm terminfo usrmount" \
|
|
|
a0a3b4 |
-d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esb ib700wdt" \
|
|
|
a0a3b4 |
-f $TESTDIR/initramfs.testing $KVERSION || return 1
|
|
|
a0a3b4 |
|
|
|
a0a3b4 |
diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
|
|
|
1755ca |
index c3c27bce..dd1f8ead 100755
|
|
|
a0a3b4 |
--- a/test/TEST-11-LVM/test.sh
|
|
|
a0a3b4 |
+++ b/test/TEST-11-LVM/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-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
|
|
|
1755ca |
index 993f71db..7f75b32d 100755
|
|
|
a0a3b4 |
--- a/test/TEST-13-ENC-RAID-LVM/test.sh
|
|
|
a0a3b4 |
+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
|
|
|
a0a3b4 |
@@ -94,7 +94,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-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
|
|
|
1755ca |
index 9b971362..c086677f 100755
|
|
|
a0a3b4 |
--- a/test/TEST-15-BTRFSRAID/test.sh
|
|
|
a0a3b4 |
+++ b/test/TEST-15-BTRFSRAID/test.sh
|
|
|
a0a3b4 |
@@ -58,7 +58,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 btrfs udev-rules base rootfs-block fs-lib kernel-modules" \
|
|
|
a0a3b4 |
+ -m "btrfs udev-rules base rootfs-block fs-lib kernel-modules" \
|
|
|
a0a3b4 |
-d "piix ide-gd_mod ata_piix btrfs sd_mod" \
|
|
|
a0a3b4 |
--nomdadmconf \
|
|
|
a0a3b4 |
-f $TESTDIR/initramfs.makeroot $KVERSION || return 1
|
|
|
a0a3b4 |
diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
|
|
|
1755ca |
index 14350e98..49dbc10e 100755
|
|
|
a0a3b4 |
--- a/test/TEST-20-NFS/test.sh
|
|
|
a0a3b4 |
+++ b/test/TEST-20-NFS/test.sh
|
|
|
a0a3b4 |
@@ -340,13 +340,13 @@ 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 e1000 i6300esb" \
|
|
|
a0a3b4 |
-f $TESTDIR/initramfs.server $KVERSION || return 1
|
|
|
a0a3b4 |
|
|
|
a0a3b4 |
# Make client's dracut image
|
|
|
a0a3b4 |
$basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
a0a3b4 |
- -o "plymouth dash" \
|
|
|
a0a3b4 |
+ -o "plymouth" \
|
|
|
a0a3b4 |
-a "debug watchdog" \
|
|
|
a0a3b4 |
-d "af_packet piix ide-gd_mod ata_piix sd_mod e1000 nfs sunrpc i6300esb" \
|
|
|
a0a3b4 |
-f $TESTDIR/initramfs.testing $KVERSION || return 1
|
|
|
a0a3b4 |
diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
|
|
|
1755ca |
index 65457a5a..5e59f0a8 100755
|
|
|
a0a3b4 |
--- a/test/TEST-30-ISCSI/test.sh
|
|
|
a0a3b4 |
+++ b/test/TEST-30-ISCSI/test.sh
|
|
|
a0a3b4 |
@@ -217,7 +217,7 @@ test_setup() {
|
|
|
a0a3b4 |
inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
|
|
|
a0a3b4 |
)
|
|
|
a0a3b4 |
sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
a0a3b4 |
- -o "dash plymouth dmraid nfs" \
|
|
|
a0a3b4 |
+ -o "plymouth dmraid nfs" \
|
|
|
a0a3b4 |
-a "debug" \
|
|
|
a0a3b4 |
-d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod" \
|
|
|
a0a3b4 |
--no-hostonly-cmdline -N \
|
|
|
a0a3b4 |
@@ -268,7 +268,7 @@ test_setup() {
|
|
|
a0a3b4 |
|
|
|
a0a3b4 |
# Make server's dracut image
|
|
|
a0a3b4 |
$basedir/dracut.sh -l -i $TESTDIR/overlay / \
|
|
|
a0a3b4 |
- -a "dash udev-rules base rootfs-block fs-lib debug kernel-modules" \
|
|
|
a0a3b4 |
+ -a "udev-rules base rootfs-block fs-lib debug kernel-modules" \
|
|
|
a0a3b4 |
-d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod e1000 drbg" \
|
|
|
a0a3b4 |
--no-hostonly-cmdline -N \
|
|
|
a0a3b4 |
-f $TESTDIR/initramfs.server $KVERSION || return 1
|