index : archinstall32 | |
Archlinux32 installer | gitolite user |
summaryrefslogtreecommitdiff |
-rw-r--r-- | archinstall/lib/global_menu.py | 44 |
diff --git a/archinstall/lib/global_menu.py b/archinstall/lib/global_menu.py index 54b30240..5a431010 100644 --- a/archinstall/lib/global_menu.py +++ b/archinstall/lib/global_menu.py @@ -169,8 +169,8 @@ class GlobalMenu(AbstractMenu): self._menu_options['install'] = \ Selector( self._install_text(), - exec_func=lambda n, v: True if len(self._missing_configs()) == 0 else False, - preview_func=self._prev_install_missing_config, + exec_func=lambda n, v: self._is_config_valid(), + preview_func=self._prev_install_invalid_config, no_store=True) self._menu_options['abort'] = Selector(_('Abort'), exec_func=lambda n,v:exit(1)) @@ -200,6 +200,14 @@ class GlobalMenu(AbstractMenu): return list(missing) + def _is_config_valid(self) -> bool: + """ + Checks the validity of the current configuration. + """ + if len(self._missing_configs()) != 0: + return False + return self._validate_bootloader() is None + def _update_install_text(self, name: str, value: str): text = self._install_text() self._menu_options['install'].update_description(text) @@ -321,12 +329,42 @@ class GlobalMenu(AbstractMenu): return disk.EncryptionType.type_to_text(current_value.encryption_type) return '' - def _prev_install_missing_config(self) -> Optional[str]: + def _validate_bootloader(self) -> Optional[str]: + """ + Checks the selected bootloader is valid for the selected filesystem + type of the boot partition. + + Returns [`None`] if the bootloader is valid, otherwise returns a + string with the error message. + """ + bootloader = self._menu_options['bootloader'].current_selection + boot_partition: Optional[disk.PartitionModification] = None + + if disk_config := self._menu_options['disk_config'].current_selection: + for layout in disk_config.device_modifications: + if boot_partition := layout.get_boot_partition(): + break + else: + return "No disk layout selected" + + if boot_partition is None: + return "Boot partition not found" + + if bootloader == Bootloader.Limine and boot_partition.fs_type == disk.FilesystemType.Btrfs: + return "Limine bootloader does not support booting from BTRFS filesystem" + + return None + + def _prev_install_invalid_config(self) -> Optional[str]: if missing := self._missing_configs(): text = str(_('Missing configurations:\n')) for m in missing: text += f'- {m}\n' return text[:-1] # remove last new line + + if error := self._validate_bootloader(): + return f"Invalid configuration: {error}" + return None def _prev_users(self) -> Optional[str]: |