|
 |
e76f14 |
From 4449e2ac20e70e85533ce0bd38d53b9980a49cb5 Mon Sep 17 00:00:00 2001
|
|
|
e76f14 |
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
e76f14 |
Date: Thu, 30 Apr 2015 17:20:26 -0400
|
|
|
e76f14 |
Subject: [PATCH] RHEL 7: v2v: efi: Remove references to Fedora / kraxel's OVMF
|
|
|
e76f14 |
packages.
|
|
|
e76f14 |
|
|
|
e76f14 |
---
|
|
|
e76f14 |
src/utils.c | 12 ------------
|
|
|
e76f14 |
v2v/utils.ml | 2 +-
|
|
|
e76f14 |
2 files changed, 1 insertion(+), 13 deletions(-)
|
|
|
e76f14 |
|
|
|
e76f14 |
diff --git a/src/utils.c b/src/utils.c
|
|
|
e76f14 |
index dbb9a44..8ffc1ed 100644
|
|
|
e76f14 |
--- a/src/utils.c
|
|
|
e76f14 |
+++ b/src/utils.c
|
|
|
e76f14 |
@@ -324,9 +324,6 @@ guestfs_int_is_true (const char *str)
|
|
|
e76f14 |
/* See src/appliance.c:guestfs_int_get_uefi. */
|
|
|
e76f14 |
const char *
|
|
|
e76f14 |
guestfs_int_ovmf_i386_firmware[] = {
|
|
|
e76f14 |
- "/usr/share/edk2.git/ovmf-ia32/OVMF_CODE-pure-efi.fd",
|
|
|
e76f14 |
- "/usr/share/edk2.git/ovmf-ia32/OVMF_VARS-pure-efi.fd",
|
|
|
e76f14 |
-
|
|
|
e76f14 |
NULL
|
|
|
e76f14 |
};
|
|
|
e76f14 |
|
|
|
e76f14 |
@@ -335,12 +332,6 @@ guestfs_int_ovmf_x86_64_firmware[] = {
|
|
|
e76f14 |
"/usr/share/OVMF/OVMF_CODE.fd",
|
|
|
e76f14 |
"/usr/share/OVMF/OVMF_VARS.fd",
|
|
|
e76f14 |
|
|
|
e76f14 |
- "/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd",
|
|
|
e76f14 |
- "/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd",
|
|
|
e76f14 |
-
|
|
|
e76f14 |
- "/usr/share/qemu/ovmf-x86_64-code.bin",
|
|
|
e76f14 |
- "/usr/share/qemu/ovmf-x86_64-vars.bin",
|
|
|
e76f14 |
-
|
|
|
e76f14 |
NULL
|
|
|
e76f14 |
};
|
|
|
e76f14 |
|
|
|
e76f14 |
@@ -349,9 +340,6 @@ guestfs_int_aavmf_firmware[] = {
|
|
|
e76f14 |
"/usr/share/AAVMF/AAVMF_CODE.fd",
|
|
|
e76f14 |
"/usr/share/AAVMF/AAVMF_VARS.fd",
|
|
|
e76f14 |
|
|
|
e76f14 |
- "/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw",
|
|
|
e76f14 |
- "/usr/share/edk2.git/aarch64/vars-template-pflash.raw",
|
|
|
e76f14 |
-
|
|
|
e76f14 |
NULL
|
|
|
e76f14 |
};
|
|
|
e76f14 |
|
|
|
e76f14 |
diff --git a/v2v/utils.ml b/v2v/utils.ml
|
|
|
e76f14 |
index 898b8d4..d88f8ad 100644
|
|
|
e76f14 |
--- a/v2v/utils.ml
|
|
|
e76f14 |
+++ b/v2v/utils.ml
|
|
|
e76f14 |
@@ -99,7 +99,7 @@ let find_uefi_firmware guest_arch =
|
|
|
e76f14 |
guest_arch in
|
|
|
e76f14 |
let rec loop = function
|
|
|
e76f14 |
| [] ->
|
|
|
e76f14 |
- error (f_"cannot find firmware for UEFI guests.\n\nYou probably need to install OVMF, or Gerd's firmware repo (https://www.kraxel.org/repos/), or AAVMF (if using aarch64)")
|
|
|
e76f14 |
+ error (f_"cannot find firmware for UEFI guests.\n\nYou probably need to install OVMF, or AAVMF (if using aarch64)")
|
|
|
e76f14 |
| ((code, vars_template) as ret) :: rest ->
|
|
|
e76f14 |
if Sys.file_exists code && Sys.file_exists vars_template then ret
|
|
|
e76f14 |
else loop rest
|
|
|
e76f14 |
--
|
|
|
7af31e |
1.8.3.1
|
|
|
e76f14 |
|