more dash removal

diff --git a/test/TEST-02-SYSTEMD/test.sh b/test/TEST-02-SYSTEMD/test.sh
index 4ebff8379f53ab4f488f50c8bee5f81ab4189e26..47268b0ea487d90eac1a267d45e50339be65c9cd 100755 (executable)
--- a/test/TEST-02-SYSTEMD/test.sh
+++ b/test/TEST-02-SYSTEMD/test.sh
@@ -58,7 +58,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 "udev-rules base rootfs-block fs-lib kernel-modules" \
        -d "piix ide-gd_mod ata_piix ext3 sd_mod" \
         --nomdadmconf \
        -f $TESTDIR/initramfs.makeroot $KVERSION || return 1

diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
index 38342386255ecc261e1409e23f2f40a034c1fdc6..01b406d05dde6e81c9ff05815186bc5e14d284fc 100755 (executable)
--- a/test/TEST-04-FULL-SYSTEMD/test.sh
+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
@@ -232,7 +232,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 "udev-rules btrfs base rootfs-block fs-lib kernel-modules" \
        -d "piix ide-gd_mod ata_piix btrfs sd_mod" \
         --nomdadmconf \
         --nohardlink \
@@ -264,7 +264,7 @@ EOF
     sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
        -a "debug systemd" \
        -I "/etc/machine-id /etc/hostname" \
-        -o "dash network plymouth lvm mdraid resume crypt i18n caps dm terminfo usrmount" \
+        -o "network plymouth lvm mdraid resume crypt i18n caps dm terminfo usrmount" \
        -d "piix ide-gd_mod ata_piix btrfs sd_mod i6300esb ib700wdt" \
        -f $TESTDIR/initramfs.testing $KVERSION || return 1
 

diff --git a/test/TEST-11-LVM/test.sh b/test/TEST-11-LVM/test.sh
index c3c27bcef4f5b7709f8bb36b537d23a543a00aaf..dd1f8eade94927444411134f340ac968818d93af 100755 (executable)
--- a/test/TEST-11-LVM/test.sh
+++ b/test/TEST-11-LVM/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-13-ENC-RAID-LVM/test.sh b/test/TEST-13-ENC-RAID-LVM/test.sh
index 993f71dbc30b865c2d4826bb7735df153eed7e39..7f75b32d681a6d0bfe22484fe0448cd494c8b46f 100755 (executable)
--- a/test/TEST-13-ENC-RAID-LVM/test.sh
+++ b/test/TEST-13-ENC-RAID-LVM/test.sh
@@ -94,7 +94,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-15-BTRFSRAID/test.sh b/test/TEST-15-BTRFSRAID/test.sh
index 9b97136293c952219b75a257c6b36144bc77f45a..c086677f6e2a474f89f54d72a66a913100e982b8 100755 (executable)
--- a/test/TEST-15-BTRFSRAID/test.sh
+++ b/test/TEST-15-BTRFSRAID/test.sh
@@ -58,7 +58,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 "btrfs udev-rules base rootfs-block fs-lib kernel-modules" \
        -d "piix ide-gd_mod ata_piix btrfs sd_mod" \
         --nomdadmconf \
        -f $TESTDIR/initramfs.makeroot $KVERSION || return 1

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index 14350e982e2c039caef860cc1481615f826647a4..49dbc10ede4d8b0e79f914c69d4bc2829d5109eb 100755 (executable)
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -340,13 +340,13 @@ 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 e1000 i6300esb" \
         -f $TESTDIR/initramfs.server $KVERSION || return 1
 
     # Make client's dracut image
     $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-        -o "plymouth dash" \
+        -o "plymouth" \
         -a "debug watchdog" \
         -d "af_packet piix ide-gd_mod ata_piix sd_mod e1000 nfs sunrpc i6300esb" \
         -f $TESTDIR/initramfs.testing $KVERSION || return 1

diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh
index 65457a5aef2d36903e4a0bffa321e76b5f928340..5e59f0a8606f79ce4923f5646f1871355d783475 100755 (executable)
--- a/test/TEST-30-ISCSI/test.sh
+++ b/test/TEST-30-ISCSI/test.sh
@@ -217,7 +217,7 @@ test_setup() {
         inst_simple ./99-idesymlinks.rules /etc/udev/rules.d/99-idesymlinks.rules
     )
     sudo $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-        -o "dash plymouth dmraid nfs" \
+        -o "plymouth dmraid nfs" \
         -a "debug" \
         -d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod" \
         --no-hostonly-cmdline -N \
@@ -268,7 +268,7 @@ test_setup() {
 
     # Make server's dracut image
     $basedir/dracut.sh -l -i $TESTDIR/overlay / \
-        -a "dash udev-rules base rootfs-block fs-lib debug kernel-modules" \
+        -a "udev-rules base rootfs-block fs-lib debug kernel-modules" \
         -d "af_packet piix ide-gd_mod ata_piix ext3 sd_mod e1000 drbg" \
         --no-hostonly-cmdline -N \
         -f $TESTDIR/initramfs.server $KVERSION || return 1