From 7e830d6a281636d387585f203db77cbc05b85592 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sun, 12 Jul 2026 10:55:43 -0700
Subject: [PATCH] Fix ISO boot finalization

Archinstall unmounts the ESP before the Omarchy finalizer runs, leaving /boot empty in the target chroot. Mount it so Limine setup can access the generated configuration and EFI artifacts.

The installed ESP uses root-only masks while finalization runs as the target user. Mount it temporarily with fmask=0022,dmask=0022 and verify the target user can traverse /boot; the installed fstab remains unchanged.

Remove the fallback shell from the installer invocation so finalizer errors propagate instead of reporting a completed installation and rebooting a partially configured system.
---
 configs/airootfs/root/.automated_script.sh | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/configs/airootfs/root/.automated_script.sh b/configs/airootfs/root/.automated_script.sh
index 7566803..1794eee 100644
--- a/configs/airootfs/root/.automated_script.sh
+++ b/configs/airootfs/root/.automated_script.sh
@@ -33,7 +33,7 @@ install_arch() {
 
 install_omarchy() {
   chroot_bash -lc "sudo pacman -S --noconfirm --needed gum" >/dev/null
-  chroot_bash -lc "source /home/$OMARCHY_USER/.local/share/omarchy/install.sh || bash"
+  chroot_bash -lc "source /home/$OMARCHY_USER/.local/share/omarchy/install.sh"
 
   configure_login_for_unencrypted_install
 
@@ -159,6 +159,24 @@ install_base_system() {
     --skip-wkd \
     --skip-wifi-check
 
+  # Archinstall unmounts the ESP when it finishes. Omarchy's boot finalizer
+  # needs the generated Limine config and EFI artifacts available under /boot.
+  if ! mountpoint -q /mnt/boot; then
+    arch-chroot /mnt mount /boot
+  fi
+
+  # The installed fstab keeps the ESP root-only, but Omarchy finalization runs
+  # as the target user and must discover the Limine config before using sudo to
+  # replace it. Temporarily allow reads and directory traversal during install.
+  boot_device=$(findmnt -nro SOURCE --target /mnt/boot)
+  umount /mnt/boot
+  mount -t vfat -o rw,fmask=0022,dmask=0022 "$boot_device" /mnt/boot
+
+  if ! arch-chroot -u "$OMARCHY_USER" /mnt test -x /boot; then
+    echo "Target user cannot access the mounted ESP" >&2
+    return 1
+  fi
+
   # After archinstall sets up the base system but before our installer runs,
   # we need to ensure the offline pacman.conf is in place
   cp /etc/pacman.conf /mnt/etc/pacman.conf