From 5970d38a1aa2fa56c6cd22115e5c77b1e42df63e Mon Sep 17 00:00:00 2001
From: "Brian C. Lane" <bcl@redhat.com>
Date: Mon, 5 Jun 2017 13:14:38 -0700
Subject: [PATCH] Fix aarch64 efi.tmpl invocation for live images

We didn't add "efiarch32" on aarch64 because it made no sense, but we
need to because it's not an optional argument in the other template.
Just make it efiarch32=None.

Also fixes a typo in share/live/uefi.tmpl

Related: rhbz#1310775
---
 share/live/aarch64.tmpl | 2 +-
 share/live/efi.tmpl     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/live/aarch64.tmpl b/share/live/aarch64.tmpl
index c7b4e84a..d4a3e385 100644
--- a/share/live/aarch64.tmpl
+++ b/share/live/aarch64.tmpl
@@ -54,7 +54,7 @@ mkdir ${KERNELDIR}
         %>
         treeinfo images-${basearch} ${img|basename} ${img}
     %endfor
-    <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch=efiarch, isolabel=isolabel"/>
+    <%include file="efi.tmpl" args="configdir=configdir, KERNELDIR=KERNELDIR, efiarch32=None, efiarch64=efiarch, isolabel=isolabel"/>
 %endif
 
 # Create optional product.img and updates.img
diff --git a/share/live/efi.tmpl b/share/live/efi.tmpl
index 096137e7..fcd9e9ad 100644
--- a/share/live/efi.tmpl
+++ b/share/live/efi.tmpl
@@ -11,7 +11,7 @@ mkdir ${EFIBOOTDIR}/fonts/
 %if exists("usr/share/shim/lockdown.efi"):
 	install usr/share/shim/lockdown.efi ${EFIBOOTDIR}/
 %endif
-%if efiarch64
+%if efiarch64:
 install boot/efi/EFI/*/shim${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI
 install boot/efi/EFI/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/
 install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi