From 68a43b9da81b550441da840cb548c5b8fd9ee5dd Mon Sep 17 00:00:00 2001 From: Xinliang Liu Date: Wed, 27 Jan 2021 02:47:58 +0000 Subject: [PATCH] Fix UEFI boot entry creation for aarch64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Diskimage-builder installs grub with option '--removable'[1], thus for aarch64 no 'grubaa64.efi' file in efi directory only got 'BOOTAA64.EFI': linaro@bm-ubuntu:~$ tree /boot/efi /boot/efi └── EFI └── BOOT └── BOOTAA64.EFI 2 directories, 1 file [1]: https://github.com/openstack/diskimage-builder/blob/8f12d9530ed79359fb988688caadfa6dc318f7a5/diskimage_builder/elements/bootloader/finalise.d/50-bootloader#L158 Task: #41698 Story: #2008560 Change-Id: I9fc55c068ea980beae273411db9d3568eec25eb8 --- ironic_python_agent/extensions/image.py | 3 ++- ...efi-boot-entry-creation-for-aarch64-2b143c5bf189c2f6.yaml | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fix-uefi-boot-entry-creation-for-aarch64-2b143c5bf189c2f6.yaml diff --git a/ironic_python_agent/extensions/image.py b/ironic_python_agent/extensions/image.py index 846589eb7..0fcfb882b 100644 --- a/ironic_python_agent/extensions/image.py +++ b/ironic_python_agent/extensions/image.py @@ -38,7 +38,8 @@ CONF = cfg.CONF BIND_MOUNTS = ('/dev', '/proc', '/run') -BOOTLOADERS_EFI = ['bootx64.efi', 'grubaa64.efi', 'winload.efi'] +BOOTLOADERS_EFI = ['bootaa64.efi', 'bootx64.efi', 'grubaa64.efi', + 'winload.efi'] def _rescan_device(device): diff --git a/releasenotes/notes/fix-uefi-boot-entry-creation-for-aarch64-2b143c5bf189c2f6.yaml b/releasenotes/notes/fix-uefi-boot-entry-creation-for-aarch64-2b143c5bf189c2f6.yaml new file mode 100644 index 000000000..dd520fae0 --- /dev/null +++ b/releasenotes/notes/fix-uefi-boot-entry-creation-for-aarch64-2b143c5bf189c2f6.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fix UEFI boot entry creation for aarch64 when using diskimage-builder + created whole disk images.