Skip to content

Commit f4bcf6d

Browse files
committed
Drop is_uefi parameter from validate_bootloader_layout
The UEFI flag is a constant system fact for the run, so the validator retrieves it via SysInfo.has_uefi() directly instead of having every caller pass it in. Updates all three call sites in global_menu.py, installer.py and guided.py, and removes the now-unused SysInfo import from guided.py.
1 parent 6818f35 commit f4bcf6d

4 files changed

Lines changed: 3 additions & 6 deletions

File tree

archinstall/lib/bootloader/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from enum import Enum, auto
33
from pathlib import Path
44

5+
from archinstall.lib.hardware import SysInfo
56
from archinstall.lib.models.bootloader import Bootloader, BootloaderConfiguration
67
from archinstall.lib.models.device import DiskLayoutConfiguration
78

@@ -22,7 +23,6 @@ class BootloaderValidationFailure:
2223
def validate_bootloader_layout(
2324
bootloader_config: BootloaderConfiguration | None,
2425
disk_config: DiskLayoutConfiguration | None,
25-
is_uefi: bool,
2626
) -> BootloaderValidationFailure | None:
2727
"""Validate bootloader configuration against disk layout.
2828
@@ -37,7 +37,7 @@ def validate_bootloader_layout(
3737
if bootloader == Bootloader.NO_BOOTLOADER:
3838
return None
3939

40-
if bootloader.is_uefi_only() and not is_uefi:
40+
if bootloader.is_uefi_only() and not SysInfo.has_uefi():
4141
return BootloaderValidationFailure(
4242
kind=BootloaderValidationFailureKind.BootloaderRequiresUefi,
4343
description=f'{bootloader.value} requires a UEFI system.',

archinstall/lib/global_menu.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ def _validate_bootloader(self) -> str | None:
488488
if efi_partition.fs_type is None or not efi_partition.fs_type.is_fat():
489489
return 'ESP must be formatted as a FAT filesystem'
490490

491-
if failure := validate_bootloader_layout(bootloader_config, disk_config, self._uefi):
491+
if failure := validate_bootloader_layout(bootloader_config, disk_config):
492492
return failure.description
493493

494494
return None

archinstall/lib/installer.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1472,7 +1472,6 @@ def _add_limine_bootloader(
14721472
if failure := validate_bootloader_layout(
14731473
BootloaderConfiguration(bootloader=Bootloader.Limine, uki=uki_enabled),
14741474
self._disk_config,
1475-
SysInfo.has_uefi(),
14761475
):
14771476
raise DiskError(failure.description)
14781477

archinstall/scripts/guided.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from archinstall.lib.disk.utils import disk_layouts
1212
from archinstall.lib.general.general_menu import PostInstallationAction, select_post_installation
1313
from archinstall.lib.global_menu import GlobalMenu
14-
from archinstall.lib.hardware import SysInfo
1514
from archinstall.lib.installer import Installer, accessibility_tools_in_use, run_custom_user_commands
1615
from archinstall.lib.menu.util import delayed_warning
1716
from archinstall.lib.mirror.mirror_handler import MirrorListHandler
@@ -218,7 +217,6 @@ def main(arch_config_handler: ArchConfigHandler | None = None) -> None:
218217
if failure := validate_bootloader_layout(
219218
arch_config_handler.config.bootloader_config,
220219
arch_config_handler.config.disk_config,
221-
SysInfo.has_uefi(),
222220
):
223221
error(failure.description)
224222
return

0 commit comments

Comments
 (0)