openstack/ironic
Code Issues Proposed changes

Fix GRUB config path when building EFI ISO

Browse Source 
Fixes GRUB configuration file generation procedure when building
bootable ISO images that include user EFI boot loader image.
Prior to this fix, no bootable ISO image could be generated
unless EFI boot loader is extracted from deploy ISO image.

Change-Id: I1a761737958662cef45885e54cf7532babae1ee1
Story: 2005738
Task: 33399
This commit is contained in:
Ilya Etingof 2019-05-14 14:08:13 +02:00
parent 5edf4f3fda
commit 306aebad48
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ironic/common/images.py
View File

@ -274,8 +274,7 @@ def create_isolinux_image_for_uefi(output_file, kernel, ramdisk,
grub_cfg = os.path.join(tmpdir, grub_rel_path) grub_cfg = os.path.join(tmpdir, grub_rel_path)
uefi_path_info = { uefi_path_info = {
esp_image: e_img_rel_path, esp_image: e_img_rel_path
grub_cfg: grub_rel_path
} }
else: else:

1
ironic/tests/unit/common/test_images.py
View File

@ -549,7 +549,6 @@ class FsImageTestCase(base.TestCase):
'path/to/kernel': 'vmlinuz', 'path/to/kernel': 'vmlinuz',
'path/to/ramdisk': 'initrd', 'path/to/ramdisk': 'initrd',
'sourceabspath/to/efiboot.img': 'boot/grub/efiboot.img', 'sourceabspath/to/efiboot.img': 'boot/grub/efiboot.img',
'tmpdir/boot/grub/grub.cfg': 'boot/grub/grub.cfg'
} }
grubcfg = "grubcfg" grubcfg = "grubcfg"

7
releasenotes/notes/fix-esp-grub-path-9e5532993dccc07a.yaml Normal file
View File

@ -0,0 +1,7 @@
---
fixes:
- |
Fixes GRUB configuration file generation procedure when building
bootable ISO images that include user EFI boot loader image.
Prior to this fix, no bootable ISO image could be generated unless
EFI boot loader is extracted from deploy ISO image.