From 3830729c1bb8cf1af160df650bc36891ee0f3858 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 29 Dec 2025 17:54:26 +0000
Subject: [PATCH] Fix code review feedback: correct kernel path and GRUB
 installation

Co-authored-by: johndoe6345789 <224850594+johndoe6345789@users.noreply.github.com>
---
 .github/workflows/build-image.yml | 4 ++--
 Dockerfile.image                  | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
index acede04..d480e27 100644
--- a/.github/workflows/build-image.yml
+++ b/.github/workflows/build-image.yml
@@ -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
diff --git a/Dockerfile.image b/Dockerfile.image
index 795dee9..00bd79d 100644
--- a/Dockerfile.image
+++ b/Dockerfile.image
@@ -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) && \