From b91beda6f56a0da95db8a41f0123abe82acdfeb4 Mon Sep 17 00:00:00 2001
From: Craig Jennings <c@cjennings.net>
Date: Tue, 20 Jan 2026 13:48:18 -0600
Subject: fix(archsetup): prevent ZFS boot failures and add validation tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Skip udev→systemd hook change on ZFS systems (ZFS hook is busybox-based)
- Add nvme to MODULES for NVMe systems (ensures devices ready for ZFS import)
- Add random.trust_cpu=off to suppress AMD RDSEED warnings
- Add has_nvme_drives() detection function

New validation tests:
- validate_terminus_font: check package installed via pacman
- validate_mkinitcpio_hooks: verify ZFS uses udev not systemd
- validate_initramfs_consolefont: check font in initramfs
- validate_nvme_module: check nvme in MODULES for NVMe systems
---
 archsetup | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

(limited to 'archsetup')

diff --git a/archsetup b/archsetup
index 275068d..16d7cc9 100755
--- a/archsetup
+++ b/archsetup
@@ -383,6 +383,12 @@ is_encrypted_root() {
     return 1
 }
 
+# NVMe Detection
+has_nvme_drives() {
+    # Returns 0 (true) if system has NVMe drives
+    ls /dev/nvme* &>/dev/null
+}
+
 # Automatic Login Configuration
 configure_autologin() {
     local do_autologin=false
@@ -1564,6 +1570,17 @@ supplemental_software() {
 boot_ux() {
     action="Boot UX" && display "title" "$action"
 
+    # Add nvme module for early loading on NVMe systems
+    # Ensures NVMe devices are available when ZFS/other hooks try to access them
+    if has_nvme_drives; then
+        action="adding nvme to mkinitcpio MODULES for early loading" && display "task" "$action"
+        if grep -q "^MODULES=()" /etc/mkinitcpio.conf; then
+            sed -i 's/^MODULES=()/MODULES=(nvme)/' /etc/mkinitcpio.conf
+        elif grep -q "^MODULES=(" /etc/mkinitcpio.conf && ! grep -q "nvme" /etc/mkinitcpio.conf; then
+            sed -i '/^MODULES=(/ s/)/ nvme)/' /etc/mkinitcpio.conf
+        fi
+    fi
+
     action="removing distro and date/time from initial screen" && display "task" "$action"
     (cat /dev/null >/etc/issue)  || error "error" "$action" "$?"
 
@@ -1578,9 +1595,13 @@ boot_ux() {
         echo "FONT=ter-132n" >> /etc/vconsole.conf
     fi
 
-    action="delegating fsck messages from udev to systemd" && display "task" "$action"
-    sed -i '/^HOOKS=/ s/\budev\b/systemd/' /etc/mkinitcpio.conf  || error "error" "$action" "$?"
-    mkinitcpio -P  >> "$logfile" 2>&1  || error "error" "running mkinitcpio -P to silence fsck messages" "$?"
+    # Only switch to systemd hook for non-ZFS systems
+    # ZFS initramfs hook is busybox-based and incompatible with systemd hook
+    if ! is_zfs_root; then
+        action="delegating fsck messages from udev to systemd" && display "task" "$action"
+        sed -i '/^HOOKS=/ s/\budev\b/systemd/' /etc/mkinitcpio.conf  || error "error" "$action" "$?"
+        mkinitcpio -P  >> "$logfile" 2>&1  || error "error" "running mkinitcpio -P to silence fsck messages" "$?"
+    fi
 
     action="configuring quiet fsck output" && display "task" "$action"
     mkdir -p /etc/systemd/system/systemd-fsck-root.service.d
@@ -1613,6 +1634,7 @@ EOF
     # GRUB: reset timeouts, adjust log levels, larger menu for HiDPI screens, and show splashscreen
     # Note: nvme.noacpi=1 disables NVMe ACPI power management to prevent freezes on some drives.
     # Safe to keep on newer drives (minor power cost), remove if battery life is critical.
+    # Note: random.trust_cpu=off disables trusting CPU for RNG (avoids AMD RDSEED warnings).
     action="configuring boot menu for silence and bootsplash" && display "task" "$action"
     if [ -f /etc/default/grub ]; then
         action="resetting timeouts and adjusting log levels on grub boot" && display "task" "$action"
@@ -1621,7 +1643,7 @@ EOF
         sed -i 's/.*GRUB_TERMINAL_OUTPUT=console/GRUB_TERMINAL_OUTPUT=gfxterm/' /etc/default/grub
         sed -i 's/.*GRUB_GFXMODE=auto/GRUB_GFXMODE=1024x768/' /etc/default/grub
         sed -i "s/.*GRUB_RECORDFAIL_TIMEOUT=.*/GRUB_RECORDFAIL_TIMEOUT=2/g" /etc/default/grub
-        sed -i "s/.*GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"rw loglevel=2 rd.systemd.show_status=auto rd.udev.log_level=2 nvme.noacpi=1 mem_sleep_default=deep nowatchdog quiet splash\"/g" /etc/default/grub
+        sed -i "s/.*GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT=\"rw loglevel=2 rd.systemd.show_status=auto rd.udev.log_level=2 nvme.noacpi=1 mem_sleep_default=deep nowatchdog random.trust_cpu=off quiet splash\"/g" /etc/default/grub
         grub-mkconfig -o /boot/grub/grub.cfg  >> "$logfile" 2>&1  || error "error" "generating grub config" "$?"
     fi
 }
-- 
cgit v1.2.3