[Libguestfs] [PATCH 2/2] uefi: Add new locations for UEFI files on Fedora (RHBZ#1338083).

Richard W.M. Jones rjones at redhat.com
Sun May 22 20:34:20 UTC 2016


Now that UEFI is fully open source the UEFI firmware can be included
in Fedora.  However the location is slightly different from the
location that was used by kraxel's out of distro firmware.  This
commit searches for UEFI files in the new location, falling back to
the old location (until the end of this year when we will drop it
entirely).

Thanks: Cole Robinson, Gerd Hoffmann (kraxel) & Microsoft for
relicensing the FAT code.
---
 src/uefi.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/uefi.c b/src/uefi.c
index 0dd2adb..44340fe 100644
--- a/src/uefi.c
+++ b/src/uefi.c
@@ -30,6 +30,7 @@
 /* See src/appliance.c:guestfs_int_get_uefi. */
 struct uefi_firmware
 guestfs_int_ovmf_i386_firmware[] = {
+  /* kraxel's old repository, these will be removed by end of 2016. */
   { "/usr/share/edk2.git/ovmf-ia32/OVMF_CODE-pure-efi.fd",
     NULL,
     "/usr/share/edk2.git/ovmf-ia32/OVMF_VARS-pure-efi.fd" },
@@ -43,6 +44,11 @@ guestfs_int_ovmf_x86_64_firmware[] = {
     NULL,
     "/usr/share/OVMF/OVMF_VARS.fd" },
 
+  { "/usr/share/edk2/ovmf/OVMF_CODE.fd",
+    NULL,
+    "/usr/share/edk2/ovmf/OVMF_VARS.fd" },
+
+  /* kraxel's old repository, these will be removed by end of 2016. */
   { "/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd",
     NULL,
     "/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd" },
@@ -60,6 +66,11 @@ guestfs_int_aavmf_firmware[] = {
     "/usr/share/AAVMF/AAVMF_CODE.verbose.fd",
     "/usr/share/AAVMF/AAVMF_VARS.fd" },
 
+  { "/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw",
+    NULL,
+    "/usr/share/edk2/aarch64/vars-template-pflash.raw" },
+
+  /* kraxel's old repository, these will be removed by end of 2016. */
   { "/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw",
     NULL,
     "/usr/share/edk2.git/aarch64/vars-template-pflash.raw" },
-- 
2.7.4




More information about the Libguestfs mailing list