From 529001d566afca88bb2304da49726b5b371d5866 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sat, 25 Jul 2026 13:05:22 -0700
Subject: [PATCH] Validate the UKI that was actually built

Hardware packages like omarchy-hw-intel-ptl swap the kernel mid-install,
so the UKI lands under a name the configurator never asked for and boot
validation halted a perfectly good install. Read the kernels back off
/usr/lib/modules/*/pkgbase instead of trusting the requested name.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
---
 .../omarchy-iso/orchestrator/phases_impl.py   | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/configs/airootfs/usr/share/omarchy-iso/orchestrator/phases_impl.py b/configs/airootfs/usr/share/omarchy-iso/orchestrator/phases_impl.py
index 81c0876..7fa34c4 100644
--- a/configs/airootfs/usr/share/omarchy-iso/orchestrator/phases_impl.py
+++ b/configs/airootfs/usr/share/omarchy-iso/orchestrator/phases_impl.py
@@ -1290,9 +1290,14 @@ def validate_boot(ctx: InstallContext) -> None:
         if not limine_binary.exists() or limine_binary.stat().st_size == 0:
             raise RuntimeError(f"{limine_binary} missing or empty")
 
-        uki = esp_mount / "EFI" / "Linux" / f"{uki_prefix}_{kernel}.efi"
-        if not uki.exists() or uki.stat().st_size == 0:
-            raise RuntimeError(f"{uki} missing or empty")
+        # Hardware packages (omarchy-hw-intel-ptl, …) can swap the kernel out
+        # from under us mid-install, so trust what's on disk over what we asked
+        # for and only fall back to the configured name when nothing's there.
+        uki_dir = esp_mount / "EFI" / "Linux"
+        candidates = _installed_kernels(ctx) or [kernel]
+        ukis = [uki_dir / f"{uki_prefix}_{name}.efi" for name in candidates]
+        if not any(uki.exists() and uki.stat().st_size for uki in ukis):
+            raise RuntimeError(f"{' / '.join(str(uki) for uki in ukis)} missing or empty")
 
         post = _read_efibootmgr()
         if not _find_label_entries(post["entries"], "Limine"):
@@ -1302,6 +1307,17 @@ def validate_boot(ctx: InstallContext) -> None:
         _validate_pre_mounted_filesystems(ctx)
 
 
+# Every kernel package leaves its pkgbase next to its modules, which is also
+# the name limine-mkinitcpio-hook builds the UKI under.
+def _installed_kernels(ctx: InstallContext) -> list[str]:
+    names = []
+    for pkgbase in sorted((ctx.target / "usr" / "lib" / "modules").glob("*/pkgbase")):
+        name = pkgbase.read_text().strip()
+        if name and name not in names:
+            names.append(name)
+    return names
+
+
 def _validate_pre_mounted_filesystems(ctx: InstallContext) -> None:
     storage = _storage_intent(ctx)
     fstab = ctx.target / "etc" / "fstab"