composefs/uki: Remove stripping .staged suffix on finalize#2171
Merged
cgwalters merged 1 commit intobootc-dev:mainfrom Apr 27, 2026
Merged
composefs/uki: Remove stripping .staged suffix on finalize#2171cgwalters merged 1 commit intobootc-dev:mainfrom
.staged suffix on finalize#2171cgwalters merged 1 commit intobootc-dev:mainfrom
Conversation
We were stripping `.staged` suffix from UKI/UKI Addons whenever unstaging the bootloader entries for the currently staged composefs deployment. Earlier we needed this as we were putting all EFI binaries in `ESP/EFI/Linux` all of which (staged or unstaged) would be picked up by the bootloader which is not what we want. We now put all EFI binaries in `ESP/EFI/Linux/bootc` and use BLS .conf files to point to the binaries, which makes the `.staged` suffix for EFI binaries irrelevant. Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request simplifies the composefs_backend_finalize logic by removing the rename_staged_uki_entries function and its associated calls. Consequently, the requirement for an ESP mount in this context is eliminated, and unused imports from rustix have been cleaned up. I have no feedback to provide as there are no review comments to evaluate.
Collaborator
Author
|
ostree test on f43 failed with a flake reran |
Collaborator
|
One random thing I was thinking we probably don't need to write staged bootloader entries until we start finalization |
cgwalters
approved these changes
Apr 27, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
We were stripping
.stagedsuffix from UKI/UKI Addons whenever unstaging the bootloader entries for the currently staged composefs deployment. Earlier we needed this as we were putting all EFI binaries inESP/EFI/Linuxall of which (staged or unstaged) would be picked up by the bootloader which is not what we want.We now put all EFI binaries in
ESP/EFI/Linux/bootcand use BLS .conf files to point to the binaries, which makes the.stagedsuffix for EFI binaries irrelevant.