From 69bf654eba0b66d8f16d9c3d7497b0ef3890792b Mon Sep 17 00:00:00 2001 From: Steve Baker Date: Fri, 5 Mar 2021 10:00:49 +1300 Subject: [PATCH] Add efibootmgr utility for UEFI boot menu management As of grub2 >= 2.02-95 calling grub2-install on an EFI partition will fail with: "this utility cannot be used for EFI platforms because it does not support UEFI Secure Boot." In the case of ironic deployments, ironic-python-agent will call efibootmgr to set the local boot for subsequent boots. This change adds efibootmgr to the image as well so any other UEFI menu changes can be made manually. Change-Id: I765ded15da07d6227d1e337960e54ad0e0d6ca39 --- diskimage_builder/elements/bootloader/pkg-map | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/diskimage_builder/elements/bootloader/pkg-map b/diskimage_builder/elements/bootloader/pkg-map index a570ed11..e57aaf52 100644 --- a/diskimage_builder/elements/bootloader/pkg-map +++ b/diskimage_builder/elements/bootloader/pkg-map @@ -18,11 +18,11 @@ "redhat": { "extlinux": "syslinux-extlinux", "grub-pc": "grub2-tools grub2", - "grub-efi-amd64": "grub2-tools grub2-pc grub2-efi-x64 grub2-efi-x64-modules", - "grub-efi-arm64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules", - "grub-efi-aarch64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules", - "grub-efi": "grub2-tools grub2-efi", - "grub-efi-x86_64": "grub2-tools grub2-efi-x64 grub2-efi-x64-modules", + "grub-efi-amd64": "grub2-tools grub2-pc grub2-efi-x64 grub2-efi-x64-modules efibootmgr", + "grub-efi-arm64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules efibootmgr", + "grub-efi-aarch64": "grub2-tools grub2-efi-aa64 grub2-efi-aa64-modules efibootmgr", + "grub-efi": "grub2-tools grub2-efi efibootmgr", + "grub-efi-x86_64": "grub2-tools grub2-efi-x64 grub2-efi-x64-modules efibootmgr", "grub-ppc64": "grub2-tools grub2" } }, @@ -30,8 +30,8 @@ "dkms_package": "dkms", "extlinux": "extlinux", "grub-pc": "grub-pc", - "grub-efi-amd64": "grub-efi grub-pc-bin", - "grub-efi-arm64": "grub-efi-arm64", + "grub-efi-amd64": "grub-efi grub-pc-bin efibootmgr", + "grub-efi-arm64": "grub-efi-arm64 efibootmgr", "grub-ppc64": "grub-ieee1275" } }