Made the Bootloader option visible during --skip-boot and set the default value to NO_BOOTLOADER when --skip-boot is present

Author: Torxed

archinstall/lib/global_menu.py

@@ -10,7 +10,7 @@
 from archinstall.tui.menu_item import MenuItem, MenuItemGroup
 
 from .applications.application_menu import ApplicationMenu
-from .args import ArchConfig, arch_config_handler
+from .args import ArchConfig
 from .authentication.authentication_menu import AuthenticationMenu
 from .configuration import save_config
 from .hardware import SysInfo
@@ -197,12 +197,6 @@ def _get_menu_options(self) -> list[MenuItem]:
 			),
 		]
 
-		if arch_config_handler.args.skip_boot:
-			for index, item in enumerate(menu_options):
-				if item.text == tr('Bootloader'):
-					menu_options.pop(index)
-					break
-
 		return menu_options
 
 	def _safe_config(self) -> None:
@@ -438,13 +432,7 @@ def _validate_bootloader(self) -> str | None:
 		boot_partition: PartitionModification | None = None
 		efi_partition: PartitionModification | None = None
 
-		if arch_config_handler.args.skip_boot:
-			# We only need to do this if statement if we hide
-			# the bootloader from the menu system, otherwise
-			# find_by_key() will be able to find it.
-			bootloader = Bootloader.NO_BOOTLOADER
-		else:
-			bootloader = self._item_group.find_by_key('bootloader').value
+		bootloader = self._item_group.find_by_key('bootloader').value
 
 		if disk_config := self._item_group.find_by_key('disk_config').value:
 			for layout in disk_config.device_modifications:

archinstall/lib/interactions/system_conf.py

@@ -6,6 +6,7 @@
 from archinstall.tui.result import ResultType
 from archinstall.tui.types import Alignment, FrameProperties, FrameStyle, Orientation, PreviewStyle
 
+from ..args import arch_config_handler
 from ..hardware import GfxDriver, SysInfo
 from ..models.bootloader import Bootloader
 
@@ -47,14 +48,25 @@ def select_kernel(preset: list[str] = []) -> list[str]:
 
 def ask_for_bootloader(preset: Bootloader | None) -> Bootloader | None:
 	# Systemd is UEFI only
+	options = []
+	hidden_options = []
+	default = None
+	header = None
+
+	if arch_config_handler.args.skip_boot:
+		default = Bootloader.NO_BOOTLOADER
+	else:
+		hidden_options += [Bootloader.NO_BOOTLOADER]
+
 	if not SysInfo.has_uefi():
-		options = [Bootloader.Grub, Bootloader.Limine]
-		default = Bootloader.Grub
+		options += [Bootloader.Grub, Bootloader.Limine]
+		if not default:
+			default = Bootloader.Grub
 		header = tr('UEFI is not detected and some options are disabled')
 	else:
-		options = [b for b in Bootloader]
-		default = Bootloader.Systemd
-		header = None
+		options += [b for b in Bootloader if b not in hidden_options]
+		if not default:
+			default = Bootloader.Systemd
 
 	items = [MenuItem(o.value, value=o) for o in options]
 	group = MenuItemGroup(items)

archinstall/lib/models/bootloader.py

@@ -28,7 +28,7 @@ def json(self) -> str:
 	def values() -> list[str]:
 		from ..args import arch_config_handler
 
-		return [e.value for e in Bootloader if e != Bootloader.NO_BOOTLOADER or arch_config_handler.args.skip_boot]
+		return [e.value for e in Bootloader if e != Bootloader.NO_BOOTLOADER or arch_config_handler.args.skip_boot is True]
 
 	@classmethod
 	def get_default(cls) -> None | Bootloader:

archinstall/tui/menu_item.py

@@ -196,6 +196,7 @@ def get_item_text(self, item: MenuItem) -> str:
 
 		max_width = self._max_items_text_width
 		display_text = item.get_display_value()
+
 		default_text = self._default_suffix(item)
 
 		text = unicode_ljust(str(item.text), max_width, ' ')