From 7b8c3b7c12ea6052c1d38016534463d0bc00f901 Mon Sep 17 00:00:00 2001
From: Richard Laager <rlaager@wiktel.com>
Date: Tue, 4 Oct 2016 00:49:11 -0500
Subject: [PATCH] Ubuntu: Update QEMU UEFI hints

---
 Ubuntu-16.04-Root-on-ZFS.md | 9 ++++++---
 Ubuntu-16.10-Root-on-ZFS.md | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Ubuntu-16.04-Root-on-ZFS.md b/Ubuntu-16.04-Root-on-ZFS.md
index 566f960..5d50380 100644
--- a/Ubuntu-16.04-Root-on-ZFS.md
+++ b/Ubuntu-16.04-Root-on-ZFS.md
@@ -440,10 +440,13 @@ Upgrade or downgrade the Areca driver if something like `RIP: 0010:[<ffffffff810
 
 Set a unique serial number on each virtual disk using libvirt or qemu (e.g. `-drive if=none,id=disk1,file=disk1.qcow2,serial=1234567890`).
 
-To be able to use UEFI in guests (instead of only BIOS booting):
+To be able to use UEFI in guests (instead of only BIOS booting), run this on the host:
 
     $ sudo apt install ovmf
     $ sudo vi /etc/libvirt/qemu.conf
-    Uncomment this line:
-    nvram = [ "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd" ]
+    Uncomment these lines:
+    nvram = [
+       "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd",
+       "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd"
+    ]
     $ sudo service libvirt-bin restart
diff --git a/Ubuntu-16.10-Root-on-ZFS.md b/Ubuntu-16.10-Root-on-ZFS.md
index adc6c4f..ab5dceb 100644
--- a/Ubuntu-16.10-Root-on-ZFS.md
+++ b/Ubuntu-16.10-Root-on-ZFS.md
@@ -452,10 +452,13 @@ Upgrade or downgrade the Areca driver if something like `RIP: 0010:[<ffffffff810
 
 Set a unique serial number on each virtual disk using libvirt or qemu (e.g. `-drive if=none,id=disk1,file=disk1.qcow2,serial=1234567890`).
 
-To be able to use UEFI in guests (instead of only BIOS booting):
+To be able to use UEFI in guests (instead of only BIOS booting), run this on the host:
 
     $ sudo apt install ovmf
     $ sudo vi /etc/libvirt/qemu.conf
-    Uncomment this line:
-    nvram = [ "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd" ]
+    Uncomment these lines:
+    nvram = [
+       "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd",
+       "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd"
+    ]
     $ sudo service libvirt-bin restart