almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix aarch64 efi.tmpl invocation for live images

Browse Source 
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
This commit is contained in:
Brian C. Lane 2017-06-05 13:14:38 -07:00
parent 8d1e55a765
commit 5970d38a1a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/live/aarch64.tmpl
View File

@ -54,7 +54,7 @@ mkdir ${KERNELDIR}
%> %>
treeinfo images-${basearch} ${img|basename} ${img} treeinfo images-${basearch} ${img|basename} ${img}
%endfor %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 %endif
# Create optional product.img and updates.img # Create optional product.img and updates.img

2
share/live/efi.tmpl
View File

@ -11,7 +11,7 @@ mkdir ${EFIBOOTDIR}/fonts/
%if exists("usr/share/shim/lockdown.efi"): %if exists("usr/share/shim/lockdown.efi"):
install usr/share/shim/lockdown.efi ${EFIBOOTDIR}/ install usr/share/shim/lockdown.efi ${EFIBOOTDIR}/
%endif %endif
%if efiarch64 %if efiarch64:
install boot/efi/EFI/*/shim${efiarch64|lower}.efi ${EFIBOOTDIR}/BOOT${efiarch64}.EFI 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/*/mm${efiarch64|lower}.efi ${EFIBOOTDIR}/
install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi install boot/efi/EFI/*/gcd${efiarch64|lower}.efi ${EFIBOOTDIR}/grub${efiarch64|lower}.efi