Skip to content

Support uki key in BLSConfig#2269

Open
Johan-Liebert1 wants to merge 2 commits into
bootc-dev:mainfrom
Johan-Liebert1:bls-uki-key
Open

Support uki key in BLSConfig#2269
Johan-Liebert1 wants to merge 2 commits into
bootc-dev:mainfrom
Johan-Liebert1:bls-uki-key

Conversation

@Johan-Liebert1

Copy link
Copy Markdown
Collaborator

Systemd >= v258 supports 'uki' key in bls configs. Update BLSConfig
struct to reflect the same. We still support the 'efi' key for
backwards compatibility

During writing of the BLSConfig files we check for systemd version and
use the appropriate key

GrubCC does not support the 'uki' key right now
See: #2268

Closes: #2263

Systemd >= v258 supports 'uki' key in bls configs. Update BLSConfig
struct to reflect the same. We still support the 'efi' key for
backwards compatibility

During writing of the BLSConfig files we check for systemd version and
use the appropriate key

GrubCC does not support the 'uki' key right now
See: bootc-dev#2268

Closes: bootc-dev#2263

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
@Johan-Liebert1 Johan-Liebert1 requested a review from cgwalters June 26, 2026 05:54
@Johan-Liebert1 Johan-Liebert1 added the ci/merge Run full CI suite (all OSes) — equivalent to merge queue label Jun 26, 2026
@bootc-bot bootc-bot Bot requested a review from henrywang June 26, 2026 05:54

#[context("Querying bootctl version")]
fn bootctl_systemd_version() -> Result<u32> {
pub(crate) fn bootctl_systemd_version() -> Result<u32> {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This isn't new, but since we're using it more...

One issue here is that this won't do the right thing in a "sysroot" style install. We may need to do another explicit chroot style operation in the install logic.

Second, since we query this a few times, we should cache the result in a OnceLock or so

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

One issue here is that this won't do the right thing in a "sysroot" style install. We may need to do another explicit chroot style operation in the install logic.

tried doing that, but bootupd fails trying to look up block device for composefs root mount. I have a fix in coreos/bootupd#1113 which I can separate out in another PR

Second, since we query this a few times, we should cache the result in a OnceLock or so

Yup. Sounds good

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

Labels

ci/merge Run full CI suite (all OSes) — equivalent to merge queue

Projects

None yet

Development

Successfully merging this pull request may close these issues.

composefs: Use uki key for Type 1 configs pointing to a UKI

2 participants