From ac9cbe0d1c1ec4795dada3b802727dca431bbd88 Mon Sep 17 00:00:00 2001
From: Jo Zzsi <jozzsicsataban@gmail.com>
Date: Sun, 17 Nov 2024 12:24:02 -0500
Subject: [PATCH] ci: remove unnecessary workarounds

---
 test/TEST-20-STORAGE/cryptroot-ask.sh      | 5 -----
 test/TEST-20-STORAGE/test.sh               | 3 ---
 test/TEST-26-ENC-RAID-LVM/cryptroot-ask.sh | 5 -----
 test/TEST-26-ENC-RAID-LVM/test.sh          | 1 -
 test/TEST-72-NBD/cryptroot-ask.sh          | 5 -----
 test/TEST-72-NBD/test.sh                   | 1 -
 6 files changed, 20 deletions(-)
 delete mode 100755 test/TEST-20-STORAGE/cryptroot-ask.sh
 delete mode 100755 test/TEST-26-ENC-RAID-LVM/cryptroot-ask.sh
 delete mode 100755 test/TEST-72-NBD/cryptroot-ask.sh

diff --git a/test/TEST-20-STORAGE/cryptroot-ask.sh b/test/TEST-20-STORAGE/cryptroot-ask.sh
deleted file mode 100755
index 7e956b38d..000000000
--- 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 b30292486..7f49bd07a 100755
--- 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
index a6b7ac70f..000000000
--- 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 deabbc97d..2f357b23a 100755
--- 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
index a6b7ac70f..000000000
--- 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 a33617f73..6093bf97e 100755
--- 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" \