Skip to content

Conversation

@Johan-Liebert1
Copy link
Collaborator

Split from #1780

  • bls-config: Rename 'efi' key to 'uki'
    Key 'uki' is more appropriate for us as the PE Binary that the key
    points to is a UKI

  • composefs/uki: Install all UKIs in EFI/Linux/bootc
    We were making a distinction based on the bootloader and installing UKIs
    in EFI/Linux for Grub and EFI/Linux/bootc for sd-boot. IMO it's better
    if we use the same directory for both bootloaders

@bootc-bot bootc-bot bot requested a review from jmarrero November 24, 2025 06:36
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request introduces two main improvements: renaming the 'efi' key to 'uki' in the BLS configuration for better clarity, and standardizing the installation path for all UKIs to 'EFI/Linux/bootc', regardless of the bootloader. The changes are consistently applied across the codebase, including configuration parsing, boot setup, and deletion logic. The removal of the now-redundant bootloader parameter in several functions simplifies the code. Overall, these are good changes that improve code clarity and maintainability. I have one minor suggestion to improve an error message.

@cgwalters
Copy link
Collaborator

Looks like this breaks test-integration-cfs, also needs a rebase

Key 'uki' is more appropriate for us as the PE Binary that the key
points to is a UKI

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
We were making a distinction based on the bootloader and installing UKIs
in EFI/Linux for Grub and EFI/Linux/bootc for sd-boot. IMO it's better
if we use the same directory for both bootloaders

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
@Johan-Liebert1
Copy link
Collaborator Author

Yeah, there seems to be an issue with systemd-boot when using the uki key. It does not list the boot entry at all. Curiously, using the efi key works fine

@cgwalters cgwalters marked this pull request as draft November 25, 2025 13:40
@cgwalters
Copy link
Collaborator

Yeah, there seems to be an issue with systemd-boot when using the uki key. It does not list the boot entry at all. Curiously, using the efi key works fine

OK, marking as draft then.

@Johan-Liebert1
Copy link
Collaborator Author

See: systemd/systemd#39886

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants