Merge "Fix GRUB config path when building EFI ISO"
This commit is contained in:
commit
dc39803eac
|
@ -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:
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -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.
|
Loading…
Reference in New Issue