Fix code review feedback: correct kernel path and GRUB installation

Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2025-12-29 17:54:26 +00:00
parent d5c7e20ebc
commit 3830729c1b
2 changed files with 4 additions and 5 deletions

View File

@@ -86,9 +86,9 @@ jobs:
echo "ESP contents:"
ls -laR /tmp/sparkos_esp/
if [ -f /tmp/sparkos_esp/EFI/BOOT/BOOTX64.EFI ]; then
echo "✓ UEFI bootloader found"
echo "✓ UEFI bootloader (GRUB) found"
fi
if [ -f /tmp/sparkos_esp/EFI/sparkos/vmlinuz ]; then
if [ -f /tmp/sparkos_esp/boot/vmlinuz ]; then
echo "✓ Kernel found"
fi
sudo umount /tmp/sparkos_esp

View File

@@ -81,14 +81,13 @@ RUN mkdir -p /output /mnt/esp /mnt/root && \
echo "Installing GRUB bootloader..." && \
mkdir -p /mnt/esp/EFI/BOOT && \
\
# Copy GRUB EFI binary
cp /usr/lib/grub/x86_64-efi/monolithic/grubx64.efi /mnt/esp/EFI/BOOT/BOOTX64.EFI 2>/dev/null || \
# Create GRUB EFI binary using grub-mkstandalone
grub-mkstandalone \
--format=x86_64-efi \
--output=/mnt/esp/EFI/BOOT/BOOTX64.EFI \
--locales="" \
--fonts="" \
"boot/grub/grub.cfg=/tmp/grub-early.cfg" && \
"boot/grub/grub.cfg=/dev/null" && \
\
# Find the kernel
KERNEL_PATH=$(find /kernel/boot -name "vmlinuz-*" | head -1) && \