Fix unbootable installs: lay the kernel into the target and own GRUB
All checks were successful
Mirror to GitHub / mirror (push) Successful in 9s

archiso keeps vmlinuz/initramfs in the ISO boot dir, not the squashfs, so
unpackfs lays down an empty /boot. The chroot's mkinitcpio/grub-mkconfig had
nothing to work with and the ESP ended up empty (firmware found no bootloader).

- shellprocess@kernel (dontChroot) copies the live kernel into the target
  /boot before the bootloader step
- post-install.sh now runs grub-install itself, including a --removable pass
  so firmware with no NVRAM entry still boots via EFI/BOOT/BOOTX64.EFI

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Breadway 2026-06-14 17:57:50 +08:00
parent 12dbec5f32
commit b9544d517b
5 changed files with 61 additions and 1 deletions

View file

@ -0,0 +1,8 @@
---
# Lay the kernel into the target /boot before the bootloader/initramfs steps.
# Runs in the live environment (not the chroot) so it can read the ISO boot dir.
dontChroot: true
timeout: 60
script:
- "/usr/bin/bash /usr/local/bin/bos-copy-kernel ${ROOT}"

View file

@ -35,7 +35,26 @@ fallback_options="-S autodetect"
PRESET PRESET
mkinitcpio -P || echo "WARN: mkinitcpio regeneration failed" mkinitcpio -P || echo "WARN: mkinitcpio regeneration failed"
# Refresh GRUB so it references the rebuilt initramfs (and the new fallback). # ---------------------------------------------------------------------------
# Install GRUB ourselves. Calamares' bootloader module runs before the kernel
# and initramfs exist (archiso keeps them out of the squashfs; shellprocess
# @kernel only lays vmlinuz down just beforehand), so its grub-install/config
# leaves the ESP empty. Redo it here, now that /boot is fully populated.
#
# Two passes: the standard NVRAM entry, plus a --removable copy to
# EFI/BOOT/BOOTX64.EFI so firmware that lost/never wrote an NVRAM entry (the
# "no boot device / screen just refreshes" failure) still finds a bootloader.
# ---------------------------------------------------------------------------
if command -v grub-install &>/dev/null; then
grub-install --target=x86_64-efi --efi-directory=/boot/efi \
--bootloader-id=BOS --recheck \
|| echo "WARN: grub-install (nvram) failed"
grub-install --target=x86_64-efi --efi-directory=/boot/efi \
--removable --recheck \
|| echo "WARN: grub-install (removable) failed"
fi
# Refresh GRUB so it references the kernel + rebuilt initramfs.
if command -v grub-mkconfig &>/dev/null; then if command -v grub-mkconfig &>/dev/null; then
grub-mkconfig -o /boot/grub/grub.cfg || echo "WARN: grub-mkconfig failed" grub-mkconfig -o /boot/grub/grub.cfg || echo "WARN: grub-mkconfig failed"
fi fi

View file

@ -1,6 +1,13 @@
--- ---
modules-search: [/etc/calamares/modules, /usr/lib/calamares/modules] modules-search: [/etc/calamares/modules, /usr/lib/calamares/modules]
# Second shellprocess instance: copies the live kernel into the target /boot
# (archiso keeps it out of the squashfs) before the bootloader step runs.
instances:
- id: kernel
module: shellprocess
config: shellprocess-kernel.conf
sequence: sequence:
- show: - show:
- welcome - welcome
@ -22,6 +29,7 @@ sequence:
- networkcfg - networkcfg
- hwclock - hwclock
- packages - packages
- shellprocess@kernel
- bootloader - bootloader
- shellprocess - shellprocess
- umount - umount

View file

@ -0,0 +1,24 @@
#!/bin/bash
# Copy the live kernel into the freshly-unpacked target /boot.
#
# archiso keeps vmlinuz/initramfs in the ISO boot dir (arch/boot/x86_64/), NOT
# in the squashfs, so the rootfs that unpackfs lays down has an empty /boot.
# Without a kernel, the chroot's `mkinitcpio -P` and `grub-mkconfig` produce
# nothing and the installed system is unbootable.
#
# Runs in the LIVE environment (Calamares shellprocess, dontChroot) so it can
# read /run/archiso/bootmnt; the target root mount point is passed as $1.
set -uo pipefail
ROOT="${1:?target root required}"
SRC="/run/archiso/bootmnt/arch/boot/x86_64"
install -d -m 0755 "$ROOT/boot"
cp -f "$SRC/vmlinuz-linux" "$ROOT/boot/vmlinuz-linux"
# Microcode, if the live medium carries it (grub-mkconfig picks it up).
for u in amd-ucode.img intel-ucode.img; do
[ -f "$SRC/$u" ] && cp -f "$SRC/$u" "$ROOT/boot/$u"
done
echo "Copied live kernel into $ROOT/boot"

View file

@ -19,4 +19,5 @@ file_permissions=(
["/etc/calamares/post-install.sh"]="0:0:755" ["/etc/calamares/post-install.sh"]="0:0:755"
["/usr/local/bin/bos-live-setup"]="0:0:755" ["/usr/local/bin/bos-live-setup"]="0:0:755"
["/usr/local/bin/bos-launch-calamares"]="0:0:755" ["/usr/local/bin/bos-launch-calamares"]="0:0:755"
["/usr/local/bin/bos-copy-kernel"]="0:0:755"
) )