secubox/secubox-deb
1
0
Fork 0
mirror of https://github.com/CyberMind-FR/secubox-deb.git synced 2026-07-30 00:19:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(live-usb): EFI embed uses \$cmdpath so it doesn't depend on label search

Browse Source 
Real UEFI hardware v2.12.7 reported landing at the grub> rescue
prompt even with the simple pre-e1a53297 embed-cfg restored. Cause:
`search --no-floppy --label ESP --set=root` failed silently on that
firmware (FAT label not recognised, predictable rename, etc.), so
\$root stayed unset, prefix was empty, configfile fell through to
the rescue shell.

Replace the embed with a single-line `configfile \$cmdpath/grub.cfg`.
\$cmdpath is set by the EFI firmware itself to the directory it
loaded BOOTX64.EFI from — for us that's (hdX,gptY)/EFI/BOOT, where
the build copies grub.cfg already. The full menu at /EFI/BOOT/grub.cfg
still does its own `search --label LIVE --set=live` to locate the
squashfs partition (unchanged), so this only changes the very first
lookup hop.

Legacy BIOS grub-install --target=i386-pc untouched — it never had
the issue.
This commit is contained in:
CyberMind-FR 2026-05-25 11:00:44 +02:00
parent a88c177372
commit dcb4ce828b
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
image/build-live-usb.sh
View File

@ -3688,18 +3688,19 @@ fi
cp "${MNT}/esp/boot/grub/grub.cfg" "${MNT}/esp/EFI/BOOT/grub.cfg"
# Build GRUB EFI — restored to the simple pre-e1a53297 working version.
# The "hardened" variant added disk/usb/usbms/ahci/ata modules (none
# exist in x86_64-efi — disks come from the EFI firmware) and a
# multi-stage search fallback that landed in a grub> shell on real
# UEFI hardware. This version was reported working on bare-metal
# amd64 in v2.10.x and earlier; keep it as-is and don't gold-plate.
# Build GRUB EFI — use $cmdpath, the variable EFI firmware sets to the
# directory it loaded BOOTX64.EFI from. /EFI/BOOT/grub.cfg sits right
# next to BOOTX64.EFI on the ESP (script copies it there above), so
# `configfile $cmdpath/grub.cfg` is a single-step lookup that doesn't
# depend on filesystem labels or partition search — both of which
# have failed on different real-hardware firmware over the v2.12.x
# series. The full grub.cfg itself still does `search --label LIVE
# --set=live` to find the squashfs partition, so that part is
# unchanged.
GRUB_MODS="part_gpt part_msdos fat ext2 normal linux boot configfile loopback chain efi_gop efi_uga ls search search_label gfxterm all_video"
cat > "${WORK_DIR}/grub-embed.cfg" <<'EMBEDCFG'
search --no-floppy --label ESP --set=root
set prefix=($root)/boot/grub
configfile $prefix/grub.cfg
configfile $cmdpath/grub.cfg
EMBEDCFG
grub-mkimage -o "${MNT}/esp/EFI/BOOT/BOOTX64.EFI" \