Another F27 Beta fix for UEFI booting

- Make EFIGRUB._efi_binary a property, not a method (adamw)
This commit is contained in:
Martin Kolman 2017-09-07 12:26:02 +02:00
parent 8f9999d1c6
commit 9fe8a4bbc9
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,30 @@
From 9325942789d69b0ec6876a93868d5a90b1893825 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 6 Sep 2017 11:25:42 -0700
Subject: [PATCH] Make EFIGRUB._efi_binary a property, not a method
This was previously a class attribute and still is one for the
other classes, and the code that uses it treats it as such. So
for EFIGRUB we need to make it a property. Without this fix,
UEFI installs crash with "TypeError: must be str, not method".
Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
pyanaconda/bootloader.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 28b6cf9b2..e24dda11c 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -1846,6 +1846,7 @@ class EFIGRUB(EFIBase, GRUB2):
if value == '32':
self._is_32bit_firmware = True
+ @property
def _efi_binary(self):
if self._is_32bit_firmware:
return "\\shimia32.efi"
--
2.13.5

View File

@ -3,7 +3,7 @@
Summary: Graphical system installer
Name: anaconda
Version: 27.20.1
Release: 2%{?dist}
Release: 3%{?dist}
License: GPLv2+ and MIT
Group: Applications/System
URL: http://fedoraproject.org/wiki/Anaconda
@ -18,6 +18,9 @@ Source0: %{name}-%{version}.tar.bz2
# Fix catch TUI not main thread exceptions (Fedora 27 Beta hotfix)
Patch0: 0001-Fix-catch-TUI-not-main-thread-exceptions.patch
# Another UEFI booting fix (#1489144)
Patch1: 0002-Make-EFIGRUB._efi_binary-a-property-not-a-method.patch
# Versions of required components (done so we make sure the buildrequires
# match the requires versions of things).
@ -243,6 +246,7 @@ runtime on NFS/HTTP/FTP servers or local disks.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
%configure
@ -336,6 +340,9 @@ update-desktop-database &> /dev/null || :
%{_prefix}/libexec/anaconda/dd_*
%changelog
* Thu Sep 07 2017 Martin Kolman <mkolman@redhat.com> - 27.20.1-3
- Make EFIGRUB._efi_binary a property, not a method (adamw)
* Mon Sep 04 2017 Martin Kolman <mkolman@redhat.com> - 27.20.1-2
- Fix catch TUI not main thread exceptions (jkonecny)