From c3418082f3bbd92163a9792121109e0deedc64fd Mon Sep 17 00:00:00 2001
From: Craig Jennings <c@cjennings.net>
Date: Sun, 18 Jan 2026 07:49:47 -0600
Subject: Fix ZFS boot failure and update ISO naming format

Bug fixes:
- Fix depmod using wrong kernel version during initramfs generation
  The script now explicitly specifies the installed kernel version
  instead of relying on uname -r (which returns the live ISO kernel)
- Add kernel module verification before mkinitcpio
- Add hostid 0x prefix to spl.spl_hostid kernel parameter

ISO naming:
- Changed format to: archzfs-vmlinuz-{version}-lts-{date}-{arch}.iso
- Example: archzfs-vmlinuz-6.12.65-lts-2026-01-18-x86_64.iso

test-vm.sh:
- Add QEMU monitor socket for automation support
---
 custom/install-archzfs | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'custom/install-archzfs')

diff --git a/custom/install-archzfs b/custom/install-archzfs
index 6b62d90..dfba090 100755
--- a/custom/install-archzfs
+++ b/custom/install-archzfs
@@ -949,6 +949,25 @@ configure_initramfs() {
     # ZFS doesn't use fsck - remove it to avoid confusing error messages
     sed -i 's/^HOOKS=.*/HOOKS=(base udev autodetect microcode modconf kms keyboard keymap consolefont block zfs filesystems)/' /mnt/etc/mkinitcpio.conf
 
+    # Get the installed kernel version (not the running kernel)
+    local kernel_ver
+    kernel_ver=$(ls /mnt/usr/lib/modules | grep lts | head -1)
+    if [[ -z "$kernel_ver" ]]; then
+        error "Could not find LTS kernel modules"
+    fi
+    info "Installed kernel: $kernel_ver"
+
+    # Ensure kernel module dependencies are up to date after DKMS build
+    # Must specify kernel version since running kernel differs from installed kernel
+    info "Updating module dependencies..."
+    arch-chroot /mnt depmod "$kernel_ver"
+
+    # Verify ZFS module exists
+    if ! [[ -f "/mnt/usr/lib/modules/$kernel_ver/updates/dkms/zfs.ko.zst" ]]; then
+        error "ZFS module not found! DKMS build may have failed."
+    fi
+    info "ZFS module verified for kernel $kernel_ver"
+
     info "Regenerating initramfs..."
     arch-chroot /mnt mkinitcpio -P
 }
@@ -966,7 +985,7 @@ GRUB_DEFAULT=0
 GRUB_TIMEOUT=5
 GRUB_DISTRIBUTOR="Arch Linux (ZFS)"
 GRUB_CMDLINE_LINUX_DEFAULT="loglevel=3"
-GRUB_CMDLINE_LINUX="root=ZFS=$POOL_NAME/ROOT/default spl.spl_hostid=$host_id"
+GRUB_CMDLINE_LINUX="root=ZFS=$POOL_NAME/ROOT/default spl.spl_hostid=0x$host_id"
 GRUB_PRELOAD_MODULES="part_gpt part_msdos zfs"
 GRUB_TERMINAL_OUTPUT="console"
 GRUB_DISABLE_OS_PROBER=true
-- 
cgit v1.2.3