From e870e43a08434a5f50cef171959b898772fc6473 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 19 Nov 2018 12:41:08 -0800 Subject: [PATCH] Add new-style UEFI firmware vars to machine templates We're about to deploy recent os-autoinst to staging. The UEFI stuff got rewritten since the version we currently have, and this is now the recommended way to handle UEFI firmware. The new vars shouldn't confuse the old code still deployed on prod, it should just ignore these vars and keep working off the old 'UEFI=1' (which causes it to autodetect the file locations). Signed-off-by: Adam Williamson --- templates | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates b/templates index 68b5015e..07b2f582 100755 --- a/templates +++ b/templates @@ -4252,6 +4252,8 @@ { key => "QEMUVGA", value => "std"}, { key => "QEMURAM", value => "2048"}, { key => "UEFI", value => "1"}, + { key => "UEFI_PFLASH_CODE", value => "/usr/share/edk2/ovmf/OVMF_CODE.fd"}, + { key => "UEFI_PFLASH_VARS", value => "/usr/share/edk2/ovmf/OVMF_VARS.fd"}, { key => "PART_TABLE_TYPE", value => "gpt"}, { key => "WORKER_CLASS", value => "qemu_x86_64" }, { key => "QEMU_VIRTIO_RNG", value => "1"} @@ -4315,6 +4317,8 @@ { key => "TIMEOUT_SCALE", value => "1.5" }, { key => "SERIALDEV", value => "ttyAMA0" }, { key => "UEFI", value => "1"}, + { key => "UEFI_PFLASH_CODE", value => "/usr/share/edk2/aarch64/QEMU_EFI.fd"}, + { key => "UEFI_PFLASH_VARS", value => "/usr/share/edk2/aarch64/QEMU_VARS.fd"}, { key => "PART_TABLE_TYPE", value => "gpt"}, { key => "WORKER_CLASS", value => "qemu_aarch64" }, { key => "QEMU_VIRTIO_RNG", value => "1"}