From 6db44c1ea6b6406679f876be08eadfc41699a64c Mon Sep 17 00:00:00 2001 From: "michael.hudson@canonical.com" Date: Thu, 19 Feb 2026 14:04:31 +1300 Subject: [PATCH] make a small change to copy_unsigned_monolithic_grub --- live-build/isobuilder/boot/riscv64.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/live-build/isobuilder/boot/riscv64.py b/live-build/isobuilder/boot/riscv64.py index 2859ee8a..9183912c 100644 --- a/live-build/isobuilder/boot/riscv64.py +++ b/live-build/isobuilder/boot/riscv64.py @@ -20,14 +20,14 @@ def copy_unsigned_monolithic_grub( "usr", "lib", "grub", - f"{grub_target}-efi", + grub_target, "monolithic", f"gcd{efi_suffix}.efi", ), efi_boot_dir.joinpath(f"boot{efi_suffix}.efi"), ) - copy_grub_modules(grub_pkg_dir, iso_root, f"{grub_target}-efi", ["*.mod", "*.lst"]) + copy_grub_modules(grub_pkg_dir, iso_root, grub_target, ["*.mod", "*.lst"]) class RISCV64BootConfigurator(GrubBootConfigurator): @@ -81,7 +81,9 @@ class RISCV64BootConfigurator(GrubBootConfigurator): # Add GRUB to tree copy_grub_common_files(grub_pkg_dir, self.iso_root) - copy_unsigned_monolithic_grub(grub_pkg_dir, "riscv64", "riscv64", self.iso_root) + copy_unsigned_monolithic_grub( + grub_pkg_dir, "riscv64", "riscv64-efi", self.iso_root + ) # Extract DTBs to tree self.logger.log("extracting device tree files")