Minor changes to UKI install flow#1802
Minor changes to UKI install flow#1802Johan-Liebert1 wants to merge 2 commits intobootc-dev:mainfrom
Conversation
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
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.
Johan-Liebert1
force-pushed
the
cfs-uki-minor-fixes
branch
from
3725ffb to
86f5cea
Compare
|
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
force-pushed
the
cfs-uki-minor-fixes
branch
from
86f5cea to
f855d30
Compare
|
Yeah, there seems to be an issue with |
OK, marking as draft then. |
|
This was happening due to "uki" keyword being introduced in v258 and but all the images had v257.x |
|
To use the uki keyword we'd need to do version detection then, which seems a bit complex. But we can merge the second commit though right? |
|
Yes, we can push the second commit. It will break existing Grub UKI systems, though, which should be hopefully fine as we recommend UKI with systemd-boot anyway. We could make it backwards compatible, but I feel like that quite misses the point of having a single directory to put UKIs |
2 participants
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