Skip to content

Commit

Permalink
efi: don't include the grub2-pc package on EFI installs
Browse files Browse the repository at this point in the history
The GRUB2() class adds the grub2 package to the list of packages to be
installed and the EFIGRUB() class inherits this which leads to grub2-pc
package being installed even on EFI installs. That's wrong because this
isn't needed for EFI and also causes a broken /etc/grub2.cfg symlink to
be created.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
  • Loading branch information
martinezjavier committed Mar 7, 2019
1 parent ecc8a42 commit 8a8cc7a
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions pyanaconda/bootloader/efi.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ def install(self, args=None):
class EFIGRUB(EFIBase, GRUB2):
"""EFI GRUBv2"""
_packages32 = [ "grub2-efi-ia32", "shim-ia32" ]
_packages_common = [ "efibootmgr" ]
_packages_common = [ "efibootmgr", "grub2-tools" ]
can_dual_boot = False
stage2_is_valid_stage1 = False
stage2_bootable = False
Expand Down Expand Up @@ -163,10 +163,8 @@ def _efi_binary(self):
@property
def packages(self):
if self._is_32bit_firmware:
return self._packages32 + self._packages_common + \
super().packages
return self._packages64 + self._packages_common + \
super().packages
return self._packages32 + self._packages_common
return self._packages64 + self._packages_common


class Aarch64EFIGRUB(EFIGRUB):
Expand Down

0 comments on commit 8a8cc7a

Please sign in to comment.