From e49a95254d439e5e83c05756a3bc92e4575360b0 Mon Sep 17 00:00:00 2001
From: Craig Jennings <c@cjennings.net>
Date: Tue, 19 May 2026 12:24:43 -0500
Subject: refactor: lift FILES= keyfile sed to ensure_initramfs_files helper
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

btrfs.sh's configure_btrfs_initramfs had a six-line inline that ensured mkinitcpio.conf's FILES= line listed the LUKS keyfile: sed-replace the existing FILES= line, then grep + append as a fallback when no FILES= line existed. The pattern is mkinitcpio-specific and self-healing rather than error-on-miss (FILES= is optional in mkinitcpio.conf, so missing means "no extra files," not a broken config).

I lifted the block into ensure_initramfs_files in lib/common.sh next to prepend_grub_cmdline_linux, then collapsed the btrfs.sh call site to a single ensure_initramfs_files line. Added three bats tests for the three cases (FILES= present and empty, FILES= present with a different value, FILES= absent entirely). Bats: 174 → 177.

No behavior change. The helper's logic matches the inline byte-for-byte: same sed pattern, same grep fallback, same final state.
---
 tests/unit/test_common.bats | 47 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

(limited to 'tests')

diff --git a/tests/unit/test_common.bats b/tests/unit/test_common.bats
index abe3938..8ce7280 100644
--- a/tests/unit/test_common.bats
+++ b/tests/unit/test_common.bats
@@ -473,3 +473,50 @@ Boot0001* ZFSBootMenu"
     ! grep -q 'cryptdevice' "$f"
     rm -f "$f"
 }
+
+#############################
+# ensure_initramfs_files
+#############################
+# ensure_initramfs_files sets mkinitcpio.conf's FILES= line to the
+# given value, replacing an existing line or appending one if absent.
+# Self-healing rather than error-on-miss: FILES= is optional, so a
+# missing line means "no extra files," not a broken config.
+
+@test "ensure_initramfs_files replaces an empty FILES= line" {
+    local f
+    f=$(mktemp)
+    printf '%s\n' 'FILES=()' > "$f"
+
+    ensure_initramfs_files "/etc/luks.key" "$f"
+
+    grep -qF 'FILES=(/etc/luks.key)' "$f"
+    rm -f "$f"
+}
+
+@test "ensure_initramfs_files replaces a FILES= line that lists a different value" {
+    local f
+    f=$(mktemp)
+    printf '%s\n' 'FILES=(/etc/old-key)' > "$f"
+
+    ensure_initramfs_files "/etc/luks.key" "$f"
+
+    grep -qF 'FILES=(/etc/luks.key)' "$f"
+    ! grep -qF '/etc/old-key' "$f"
+    rm -f "$f"
+}
+
+@test "ensure_initramfs_files appends FILES= when the line is absent" {
+    local f
+    f=$(mktemp)
+    printf '%s\n' \
+        'MODULES=()' \
+        'BINARIES=()' \
+        'HOOKS=(base udev)' > "$f"
+
+    ensure_initramfs_files "/etc/luks.key" "$f"
+
+    grep -qF 'FILES=(/etc/luks.key)' "$f"
+    grep -qF 'MODULES=()' "$f"
+    grep -qF 'HOOKS=(base udev)' "$f"
+    rm -f "$f"
+}
-- 
cgit v1.2.3