From deb0e19514b547a212524c28fb0b208cebb60b89 Mon Sep 17 00:00:00 2001 From: Manuel Date: Fri, 25 Apr 2025 17:28:23 +0000 Subject: [PATCH] new commit --- builder/core/bootloaders.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/builder/core/bootloaders.py b/builder/core/bootloaders.py index de692e36..849f21ea 100644 --- a/builder/core/bootloaders.py +++ b/builder/core/bootloaders.py @@ -271,6 +271,7 @@ def create_grub_efi_boot(architecture, paths, grub_cfg_template_dir, memtest_wan "--", f"--directory=/usr/lib/grub/{grub_platform}", f"--format={grub_platform}", + f"--format={grub_platform}", f"--output={efi_file_tmp_path}", f"boot/grub/grub.cfg" ] @@ -307,13 +308,18 @@ def create_grub_efi_boot(architecture, paths, grub_cfg_template_dir, memtest_wan if arch == "i686": grub_arch = "i386" efi_arch = "ia32" + grub_platform = "i386-efi" elif arch == "x86_64": grub_arch = "x86_64" efi_arch = "x64" - efi_images[arch] = build_grub_image(architecture, grub_arch, efi_arch) + grub_platform = "x86_64-efi" + + efi_images[arch] = build_grub_image(architecture, grub_arch, efi_arch, grub_platform) elif architecture == "aarch64": - build_grub_image(architecture, "arm64", "aa64") + grub_platform = "arm64-efi" + build_grub_image(architecture, "arm64", "aa64", grub_platform) + logger.info("=> Copying EFI boot files from efiboot.img to ISO root...") efi_boot_dest_in_iso = os.path.join(paths['IMAGEDIR'], 'EFI', 'BOOT') os.makedirs(efi_boot_dest_in_iso, exist_ok=True)