[PATCH] Use shim on aarch64.
Will Woods
wwoods at redhat.com
Fri Sep 26 20:57:04 UTC 2014
Looks sensible here. ACK.
On Fri, 2014-09-26 at 16:40 -0400, Peter Jones wrote:
> We have shim and grub working together on aarch64 now, so we may as well
> use them.
>
> (this also makes the case of boot${arch}.efi not mixed-case, which
> should guarantee it's in FAT rather than VFAT...)
>
> Related: rhbz#1100048
>
> Signed-off-by: Peter Jones <pjones at redhat.com>
> ---
> share/aarch64.tmpl | 2 +-
> share/efi.tmpl | 10 +++-------
> 2 files changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/share/aarch64.tmpl b/share/aarch64.tmpl
> index c341aae..66af43f 100644
> --- a/share/aarch64.tmpl
> +++ b/share/aarch64.tmpl
> @@ -27,7 +27,7 @@ mkdir ${KERNELDIR}
> <% efiargs=""; efigraft="" %>
> %if exists("boot/efi/EFI/*/grubaa64.efi"):
> <%
> - efiarch = 'AARCH64'
> + efiarch = 'AA64'
> efigraft="EFI/BOOT={0}/EFI/BOOT".format(outroot)
> images = ["images/efiboot.img"]
> for img in images:
> diff --git a/share/efi.tmpl b/share/efi.tmpl
> index 6e0c600..3e3ca19 100644
> --- a/share/efi.tmpl
> +++ b/share/efi.tmpl
> @@ -1,5 +1,6 @@
> <%page args="configdir, KERNELDIR, efiarch, isolabel"/>
> <%
> +from string import lower
> EFIBOOTDIR="EFI/BOOT"
> APPLE_EFI_ICON=inroot+"/usr/share/pixmaps/bootloader/fedora.icns"
> APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol"
> @@ -7,14 +8,9 @@ APPLE_EFI_DISKNAME=inroot+"/usr/share/pixmaps/bootloader/fedora-media.vol"
>
> mkdir ${EFIBOOTDIR}
> mkdir ${EFIBOOTDIR}/fonts/
> -%if efiarch == 'AARCH64':
> -install boot/efi/EFI/*/grubaa64.efi ${EFIBOOTDIR}/BOOTAA64.efi
> -install boot/efi/EFI/*/grubaa64.efi ${EFIBOOTDIR}/grubaa64.efi
> -%else:
> -install boot/efi/EFI/*/shim.efi ${EFIBOOTDIR}/BOOT${efiarch}.efi
> +install boot/efi/EFI/*/shim.efi ${EFIBOOTDIR}/BOOT${efiarch}.EFI
> install boot/efi/EFI/*/MokManager.efi ${EFIBOOTDIR}/
> -install boot/efi/EFI/*/gcdx64.efi ${EFIBOOTDIR}/grubx64.efi
> -%endif
> +install boot/efi/EFI/*/gcd${efiarch|lower}.efi ${EFIBOOTDIR}/grub${efiarch|lower}.efi
> install boot/efi/EFI/*/fonts/unicode.pf2 ${EFIBOOTDIR}/fonts/
> %if exists("usr/share/shim/lockdown.efi"):
> install usr/share/shim/lockdown.efi ${EFIBOOTDIR}/
More information about the anaconda-patches
mailing list