On 02/20/2014 09:38 AM, Martin Kolman wrote:
On Thu, 2014-02-20 at 09:22 -0600, d.marlin wrote:
> ARMv8 does not use secureboot, so does not use shim.efi to load
> grub. Make the EFI binary a variable, and override it for ARMv8.
>
> Signed-off-by: David A. Marlin <dmarlin(a)redhat.com>
> ---
> pyanaconda/bootloader.py | 5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
> index 90505a9..9cf73c4 100644
> --- a/pyanaconda/bootloader.py
> +++ b/pyanaconda/bootloader.py
> @@ -1642,6 +1642,8 @@ class EFIGRUB(GRUB2):
> stage2_is_valid_stage1 = False
> stage2_bootable = False
>
> + _efi_binary = "\\shim.efi"
> +
> @property
> def _config_dir(self):
> return "efi/EFI/%s" % (self.efi_dir,)
> @@ -1701,7 +1703,7 @@ class EFIGRUB(GRUB2):
> rc = self.efibootmgr("-c", "-w", "-L",
productName,
> "-d", boot_disk.path, "-p",
boot_part_num,
> "-l",
> - self.efi_dir_as_efifs_dir + "\\shim.efi",
> + self.efi_dir_as_efifs_dir + self._efi_binary),
> root=ROOT_PATH)
> if rc:
> raise BootLoaderError("failed to set new efi boot target")
> @@ -1741,6 +1743,7 @@ class Aarch64EFIGRUB(EFIGRUB):
>
> _serial_consoles = ["ttyAMA", "ttyS"]
>
> + _efi_binary = "\\grubaa64.efi"
>
> class MacEFIGRUB(EFIGRUB):
> def mactel_config(self):
Looks fine to me.
BZ's now created for this:
RHEL7 BZ#1067758, Acadia BZ#1067759
d.marlin
=========
_______________________________________________
anaconda-patches mailing list
anaconda-patches(a)lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/anaconda-patches