Add dialog to install EFI bootloader to removable location

This is just for GRUB and Limine for now.

Author: Mintsuki

archinstall/lib/args.py

@@ -65,6 +65,7 @@ class ArchConfig:
 	mirror_config: MirrorConfiguration | None = None
 	network_config: NetworkConfiguration | None = None
 	bootloader: Bootloader | None = None
+	bootloader_removable: bool = False
 	uki: bool = False
 	app_config: ApplicationConfiguration | None = None
 	auth_config: AuthenticationConfiguration | None = None
@@ -103,6 +104,7 @@ def safe_json(self) -> dict[str, Any]:
 			'hostname': self.hostname,
 			'kernels': self.kernels,
 			'uki': self.uki,
+			'bootloader_removable': self.bootloader_removable,
 			'ntp': self.ntp,
 			'packages': self.packages,
 			'parallel_downloads': self.parallel_downloads,
@@ -183,6 +185,7 @@ def from_config(cls, args_config: dict[str, Any], args: Arguments) -> 'ArchConfi
 			arch_config.bootloader = Bootloader.from_arg(bootloader_config, args.skip_boot)
 
 		arch_config.uki = args_config.get('uki', False)
+		arch_config.bootloader_removable = args_config.get('bootloader_removable', False)
 
 		if args_config.get('uki') and (arch_config.bootloader is None or not arch_config.bootloader.has_uki_support()):
 			arch_config.uki = False

archinstall/lib/global_menu.py

@@ -22,7 +22,7 @@
 	ask_ntp,
 )
 from .interactions.network_menu import ask_to_configure_network
-from .interactions.system_conf import ask_for_bootloader, ask_for_swap, ask_for_uki, select_kernel
+from .interactions.system_conf import ask_for_bootloader, ask_for_bootloader_removable, ask_for_swap, ask_for_uki, select_kernel
 from .locale.locale_menu import LocaleMenu
 from .menu.abstract_menu import CONFIG_KEY, AbstractMenu
 from .mirrors import MirrorMenu
@@ -512,6 +512,15 @@ def _select_bootloader(self, preset: Bootloader | None) -> Bootloader | None:
 			else:
 				uki.enabled = True
 
+			# If GRUB or Limine is selected on UEFI, immediately ask about removable installation
+			if bootloader in [Bootloader.Grub, Bootloader.Limine] and SysInfo.has_uefi():
+				current_removable = self._arch_config.bootloader_removable
+				removable = ask_for_bootloader_removable(current_removable)
+				self._arch_config.bootloader_removable = removable
+			else:
+				# Reset removable flag for other bootloaders
+				self._arch_config.bootloader_removable = False
+
 		return bootloader
 
 	def _select_profile(self, current_profile: ProfileConfiguration | None) -> ProfileConfiguration | None:

archinstall/lib/installer.py

@@ -1260,6 +1260,7 @@ def _add_grub_bootloader(
 		boot_partition: PartitionModification,
 		root: PartitionModification | LvmVolume,
 		efi_partition: PartitionModification | None,
+		bootloader_removable: bool = False,
 	) -> None:
 		debug('Installing grub bootloader')
 
@@ -1303,9 +1304,11 @@ def _add_grub_bootloader(
 				f'--efi-directory={efi_partition.mountpoint}',
 				*boot_dir_arg,
 				'--bootloader-id=GRUB',
-				'--removable',
 			]
 
+			if bootloader_removable:
+				add_options.append('--removable')
+
 			command.extend(add_options)
 
 			try:
@@ -1346,6 +1349,7 @@ def _add_limine_bootloader(
 		efi_partition: PartitionModification | None,
 		root: PartitionModification | LvmVolume,
 		uki_enabled: bool = False,
+		bootloader_removable: bool = False,
 	) -> None:
 		debug('Installing Limine bootloader')
 
@@ -1368,17 +1372,11 @@ def _add_limine_bootloader(
 			info(f'Limine EFI partition: {efi_partition.dev_path}')
 
 			parent_dev_path = device_handler.get_parent_device_path(efi_partition.safe_dev_path)
-			is_target_usb = (
-				SysCommand(
-					f'udevadm info --no-pager --query=property --property=ID_BUS --value --name={parent_dev_path}',
-				).decode()
-				== 'usb'
-			)
 
 			try:
 				efi_dir_path = self.target / efi_partition.mountpoint.relative_to('/') / 'EFI'
 				efi_dir_path_target = efi_partition.mountpoint / 'EFI'
-				if is_target_usb:
+				if bootloader_removable:
 					efi_dir_path = efi_dir_path / 'BOOT'
 					efi_dir_path_target = efi_dir_path_target / 'BOOT'
 				else:
@@ -1398,7 +1396,7 @@ def _add_limine_bootloader(
 				f'/usr/bin/cp /usr/share/limine/BOOTIA32.EFI {efi_dir_path_target}/ && /usr/bin/cp /usr/share/limine/BOOTX64.EFI {efi_dir_path_target}/'
 			)
 
-			if not is_target_usb:
+			if not bootloader_removable:
 				# Create EFI boot menu entry for Limine.
 				try:
 					with open('/sys/firmware/efi/fw_platform_size') as fw_platform_size:
@@ -1604,7 +1602,7 @@ def _config_uki(
 		if not self.mkinitcpio(['-P']):
 			error('Error generating initramfs (continuing anyway)')
 
-	def add_bootloader(self, bootloader: Bootloader, uki_enabled: bool = False) -> None:
+	def add_bootloader(self, bootloader: Bootloader, uki_enabled: bool = False, bootloader_removable: bool = False) -> None:
 		"""
 		Adds a bootloader to the installation instance.
 		Archinstall supports one of three types:
@@ -1614,6 +1612,8 @@ def add_bootloader(self, bootloader: Bootloader, uki_enabled: bool = False) -> N
 		* efistub (beta)
 
 		:param bootloader: Type of bootloader to be added
+		:param uki_enabled: Whether to use unified kernel images
+		:param bootloader_removable: Whether to install to removable media location (UEFI only, for GRUB and Limine)
 		"""
 
 		for plugin in plugins.values():
@@ -1642,11 +1642,11 @@ def add_bootloader(self, bootloader: Bootloader, uki_enabled: bool = False) -> N
 			case Bootloader.Systemd:
 				self._add_systemd_bootloader(boot_partition, root, efi_partition, uki_enabled)
 			case Bootloader.Grub:
-				self._add_grub_bootloader(boot_partition, root, efi_partition)
+				self._add_grub_bootloader(boot_partition, root, efi_partition, bootloader_removable)
 			case Bootloader.Efistub:
 				self._add_efistub_bootloader(boot_partition, root, uki_enabled)
 			case Bootloader.Limine:
-				self._add_limine_bootloader(boot_partition, efi_partition, root, uki_enabled)
+				self._add_limine_bootloader(boot_partition, efi_partition, root, uki_enabled, bootloader_removable)
 
 	def add_additional_packages(self, packages: str | list[str]) -> None:
 		return self.pacman.strap(packages)

archinstall/lib/interactions/system_conf.py

@@ -90,6 +90,41 @@ def ask_for_bootloader(preset: Bootloader | None) -> Bootloader | None:
 			raise ValueError('Unhandled result type')
 
 
+def ask_for_bootloader_removable(preset: bool = False) -> bool:
+	prompt = (
+		tr('Would you like to install the bootloader to a removable media location?')
+		+ '\n\n'
+		+ tr('This installs the bootloader to /EFI/BOOT/BOOTX64.EFI (or similar) which is useful for:')
+		+ '\n'
+		+ tr('  • USB drives and external media')
+		+ '\n'
+		+ tr('  • Systems where you want the disk to be bootable on any computer')
+		+ '\n'
+		+ tr('  • Firmware that does not properly support NVRAM boot entries')
+		+ '\n'
+	)
+
+	group = MenuItemGroup.yes_no()
+	group.set_focus_by_value(preset)
+
+	result = SelectMenu[bool](
+		group,
+		header=prompt,
+		columns=2,
+		orientation=Orientation.HORIZONTAL,
+		alignment=Alignment.CENTER,
+		allow_skip=True,
+	).run()
+
+	match result.type_:
+		case ResultType.Skip:
+			return preset
+		case ResultType.Selection:
+			return result.item() == MenuItem.yes()
+		case ResultType.Reset:
+			raise ValueError('Unhandled result type')
+
+
 def ask_for_uki(preset: bool = True) -> bool:
 	prompt = tr('Would you like to use unified kernel images?') + '\n'
 

archinstall/scripts/guided.py

@@ -103,7 +103,7 @@ def perform_installation(mountpoint: Path) -> None:
 			if config.bootloader == Bootloader.Grub and SysInfo.has_uefi():
 				installation.add_additional_packages('grub')
 
-			installation.add_bootloader(config.bootloader, config.uki)
+			installation.add_bootloader(config.bootloader, config.uki, config.bootloader_removable)
 
 		# If user selected to copy the current ISO network configuration
 		# Perform a copy of the config