ci: remove unnecessary workarounds

diff --git a/test/TEST-20-STORAGE/cryptroot-ask.sh b/test/TEST-20-STORAGE/cryptroot-ask.sh
deleted file mode 100755 (executable)
index 7e956b3..0000000
--- a/test/TEST-20-STORAGE/cryptroot-ask.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-[ -b "/dev/mapper/$2" ] && exit 0
-printf test > /keyfile
-/sbin/cryptsetup luksOpen "$1" "$2" < /keyfile

diff --git a/test/TEST-20-STORAGE/test.sh b/test/TEST-20-STORAGE/test.sh
index b3029248694b078ed27222bf7102c3bd2580f581..7f49bd07a00fe60906374f21ed70817165d4c774 100755 (executable)
--- a/test/TEST-20-STORAGE/test.sh
+++ b/test/TEST-20-STORAGE/test.sh
@@ -150,7 +150,6 @@ test_setup() {
 
         eval "$(grep -F --binary-files=text -m 1 MD_UUID "$TESTDIR"/marker.img)"
         echo "$MD_UUID" > "$TESTDIR"/mduuid
-        echo "ARRAY /dev/md0 level=raid1 num-devices=2 UUID=$MD_UUID" > /tmp/mdadm.conf
 
         eval "$(grep -F -a -m 1 ID_FS_UUID "$TESTDIR"/marker.img)"
         echo "$ID_FS_UUID" > "$TESTDIR"/luksuuid
@@ -165,8 +164,6 @@ test_setup() {
         $(if command -v mdadm > /dev/null; then echo "-a mdraid"; fi) \
         $(if command -v cryptsetup > /dev/null; then echo "-a crypt"; fi) \
         $(if [ "$TEST_FSTYPE" = "zfs" ]; then echo "-a zfs"; fi) \
-        -i "/tmp/mdadm.conf" "/etc/mdadm.conf" \
-        -i "./cryptroot-ask.sh" "/sbin/cryptroot-ask" \
         -i "/tmp/crypttab" "/etc/crypttab" \
         -i "/tmp/key" "/etc/key" \
         "$TESTDIR"/initramfs.testing

diff --git a/test/TEST-26-ENC-RAID-LVM/cryptroot-ask.sh b/test/TEST-26-ENC-RAID-LVM/cryptroot-ask.sh
deleted file mode 100755 (executable)
index a6b7ac7..0000000
--- a/test/TEST-26-ENC-RAID-LVM/cryptroot-ask.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-[ -b /dev/mapper/"$2" ] && exit 0
-printf test > /keyfile
-/sbin/cryptsetup luksOpen "$1" "$2" < /keyfile

diff --git a/test/TEST-26-ENC-RAID-LVM/test.sh b/test/TEST-26-ENC-RAID-LVM/test.sh
index deabbc97dc11f92bd28f6807538789acfefd487f..2f357b23a842d80a99a90f63fbf3f46e6c929a30 100755 (executable)
--- a/test/TEST-26-ENC-RAID-LVM/test.sh
+++ b/test/TEST-26-ENC-RAID-LVM/test.sh
@@ -101,7 +101,6 @@ test_setup() {
 
     test_dracut \
         -a "crypt lvm mdraid" \
-        -i "./cryptroot-ask.sh" "/sbin/cryptroot-ask" \
         -i "/tmp/crypttab" "/etc/crypttab" \
         -i "/tmp/key" "/etc/key" \
         "$TESTDIR"/initramfs.testing

diff --git a/test/TEST-72-NBD/cryptroot-ask.sh b/test/TEST-72-NBD/cryptroot-ask.sh
deleted file mode 100755 (executable)
index a6b7ac7..0000000
--- a/test/TEST-72-NBD/cryptroot-ask.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-[ -b /dev/mapper/"$2" ] && exit 0
-printf test > /keyfile
-/sbin/cryptsetup luksOpen "$1" "$2" < /keyfile

diff --git a/test/TEST-72-NBD/test.sh b/test/TEST-72-NBD/test.sh
index a33617f73c4608cbaaaf67cfc67e096c5915dc79..6093bf97e653ec7e43e1b89f214ebfcd3795e55c 100755 (executable)
--- a/test/TEST-72-NBD/test.sh
+++ b/test/TEST-72-NBD/test.sh
@@ -337,7 +337,6 @@ test_setup() {
     test_dracut \
         --no-hostonly --no-hostonly-cmdline \
         -a "${USE_NETWORK}" \
-        -i "./cryptroot-ask.sh" "/sbin/cryptroot-ask" \
         -i "./client.link" "/etc/systemd/network/01-client.link" \
         -i "/tmp/crypttab" "/etc/crypttab" \
         -i "/tmp/key" "/etc/key" \