Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan M. Taylor <dylan@dylanmtaylor.com>2021-04-29 16:59:43 -0400
committerGitHub <noreply@github.com>2021-04-29 16:59:43 -0400
commit4ce97aaa8c395f24c96212471b32fb00987c0386 (patch)
tree37d55e4852ca5fd2d0e0a9726ee1b0f53c1129e9
parent5194fdc75cb1da7a54b1c7a7c54888bf721c5327 (diff)
Partially revert hasUEFI grub/efibootmgr change to fix GRUB
-rw-r--r--archinstall/lib/installer.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index a7b36481..1443a0f9 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -51,6 +51,10 @@ class Installer():
self.base_packages = base_packages.split(' ') if type(base_packages) is str else base_packages
for kernel in kernels:
self.base_packages.append(kernel)
+ if hasUEFI():
+ self.base_packages.append("efibootmgr")
+ else:
+ self.base_packages.append("grub")
self.post_base_install = []
@@ -366,7 +370,6 @@ class Installer():
self.log(f'Adding bootloader {bootloader} to {boot_partition if boot_partition else root_partition}', level=logging.INFO)
if bootloader == 'systemd-bootctl':
- self.pacstrap('efibootmgr')
if not hasUEFI():
raise HardwareIncompatibilityError
@@ -430,7 +433,6 @@ class Installer():
raise RequirementError(f"Could not identify the UUID of {self.partition}, there for {self.target}/boot/loader/entries/arch.conf will be broken until fixed.")
elif bootloader == "grub-install":
- self.pacstrap('grub')
if hasUEFI():
o = b''.join(sys_command(f'/usr/bin/arch-chroot {self.target} grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=GRUB'))