tablet/grub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util/grub-mkrescue: Preserve a copy of the EFI bootloaders on the ISO 9660 file system

Browse Source 
To enable file system transposition support for UEFI, we also must ensure that
there exists a copy of the EFI bootloaders, that are currently embedded in the
efi.img for xorriso, at their expected UEFI location on the ISO 9660 file system.

This is accomplished by removing the use of a temporary directory to create the
efi/ content, to instead place it at the root of the ISO 9660 content.

Signed-off-by: Pete Batard <pete@akeo.ie>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Pete Batard 2022-11-25 17:22:16 +00:00 committed by Daniel Kiper
parent c567d89660
commit a41fafd3ce
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util/grub-mkrescue.c
View File

@ -745,9 +745,8 @@ main (int argc, char *argv[])
|| source_dirs[GRUB_INSTALL_PLATFORM_RISCV32_EFI]
|| source_dirs[GRUB_INSTALL_PLATFORM_RISCV64_EFI])
{
char *efidir = grub_util_make_temporary_dir ();
char *efidir_efi = grub_util_path_concat (2, efidir, "efi");
char *efidir_efi_boot = grub_util_path_concat (3, efidir, "efi", "boot");
char *efidir_efi = grub_util_path_concat (2, iso9660_dir, "efi");
char *efidir_efi_boot = grub_util_path_concat (3, iso9660_dir, "efi", "boot");
char *imgname, *img32, *img64, *img_mac = NULL;
char *efiimgfat;
grub_install_mkdir_p (efidir_efi_boot);
@ -828,10 +827,9 @@ main (int argc, char *argv[])
xorriso_push ("-efi-boot-part");
xorriso_push ("--efi-boot-image");
grub_util_unlink_recursive (efidir);
/* Don't unlink the efidir_efi_boot directory so that we have a duplicate on the ISO 9660 file system. */
free (efiimgfat);
free (efidir_efi);
free (efidir);
grub_install_pop_module ();
grub_install_pop_module ();
grub_install_pop_module ();