-
-
Notifications
You must be signed in to change notification settings - Fork 737
Fix Limine install with ESP mounted outside /boot #4442
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
svartkanin
merged 4 commits into
archlinux:master
from
Softer:fix-limine-removable-esp-mountpoint
Apr 22, 2026
Merged
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
71cd6d4
Fix Limine install with ESP mounted outside /boot
Softer d7f6b7f
Extract bootloader layout validation into lib/bootloader/utils
Softer 70a9797
Consolidate Limine layout validation in bootloader utils
Softer a7a193b
Encapsulate FAT filesystem detection in FilesystemType.is_fat()
Softer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| from pathlib import Path | ||
|
|
||
| from archinstall.lib.models.bootloader import Bootloader, BootloaderConfiguration | ||
| from archinstall.lib.models.device import DiskLayoutConfiguration | ||
|
|
||
|
|
||
| def validate_bootloader_layout( | ||
| bootloader_config: BootloaderConfiguration | None, | ||
| disk_config: DiskLayoutConfiguration | None, | ||
| ) -> str | None: | ||
| """Validate bootloader configuration against disk layout. | ||
|
|
||
| Returns an error message if the configuration would produce an | ||
| unbootable system, or None if it is valid. | ||
| """ | ||
| # Limine can only read FAT. When the ESP is the boot partition but | ||
| # mounted outside /boot and UKI is disabled, the kernel ends up on the | ||
| # root filesystem which Limine cannot access. | ||
| if not (bootloader_config and bootloader_config.bootloader == Bootloader.Limine and not bootloader_config.uki and disk_config): | ||
| return None | ||
|
|
||
| efi_part = next( | ||
| (p for m in disk_config.device_modifications if (p := m.get_efi_partition())), | ||
| None, | ||
| ) | ||
| boot_part = next( | ||
| (p for m in disk_config.device_modifications if (p := m.get_boot_partition())), | ||
| None, | ||
| ) | ||
|
|
||
| if efi_part and boot_part == efi_part and efi_part.mountpoint != Path('/boot'): | ||
| return ( | ||
| f'Limine requires kernels on a FAT partition. The ESP is mounted at {efi_part.mountpoint}, ' | ||
| 'enable UKI or add a separate /boot partition to install Limine.' | ||
| ) | ||
| return None | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The validation should return a
booland then the caller should decide what to do with a false validationThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also can we simplify this altogether and use it in all different places (global_menu, guided and installer)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the consolidation push. Tried the Enum.description() shape first but hit a snag: {efi_part.mountpoint} needs resolved partition context that isn't available inside an Enum method. Went with this instead:
description is built inside validate_bootloader_layout where partitions are in scope. Callers use failure.description (or match on .kind if they need to branch). Happy to rename or flatten if you'd prefer a different shape.
While there, pulled the FAT-boot check into the same util so all three call sites (GlobalMenu, guided.py, Installer._add_limine_bootloader) go through one function.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Softer not sure I'm following, why can't we pass that as a parameter?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed the current dataclass is redundant - description is derived from kind, no reason to store both. But a flat enum with description(mountpoint=None) trades one smell for another: the optional param lets LimineLayout.description() silently render "mounted at None" and accepts a mountpoint on kinds that don't need it.
What about a variant-per-context shape instead? Flat enum for context-free kinds, a frozen dataclass per parametrized kind, joined by a | None union:
BootloaderValidationResult = BootloaderValidationFailure | LimineLayoutFailure | None