add efibootmgr only on uefi systems

2 files changed, 6 insertions, 4 deletions

diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 10a9ad4b..f6c891a3 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -39,7 +39,7 @@ class Installer():
 	:type hostname: str, optional
 
 	"""
-	def __init__(self, target, *, base_packages='base base-devel linux linux-firmware efibootmgr'):
+	def __init__(self, target, *, base_packages='base base-devel linux linux-firmware'):
 		self.target = target
 		self.init_time = time.strftime('%Y-%m-%d_%H-%M-%S')
 		self.milliseconds = int(str(time.time()).split('.')[1])
@@ -50,8 +50,10 @@ class Installer():
 		}
 		
 		self.base_packages = base_packages.split(' ') if type(base_packages) is str else base_packages
-		if hasUEFI() == False:
-			self.base_packages.pop(self.base_packages.index("efibootmgr"))
+		if hasUEFI():
+			self.base_packages.append("efibootmgr")
+		else:
+			self.base_packages.append("grub")
 		self.post_base_install = []
 
 		storage['session'] = self
diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index 175079ee..70ff7a1e 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -149,7 +149,7 @@ def ask_for_bootloader() -> str:
 	if hasUEFI()==False:
 		bootloader="grub-install"
 	else:
-		bootloader_choice = input("Would you like to use GRUB as a bootloader instead off systemd-boot [y/N] ").lower()
+		bootloader_choice = input("Would you like to use GRUB as a bootloader instead of systemd-boot? [y/N] ").lower()
 		if bootloader_choice == "y":
 			bootloader="grub-install"
 	return bootloader