Cleanup systemd UKI support #1623

Johan-Liebert1 · 2025-09-18T10:35:44Z

Changes in this PR

Adds a field cfg_type to BLSConfig which will contain either of the
following key:

BLSConfig {
    cfg_type: NonEFI {
        linux: String,
        initrd: Vec<String>,
        options: Some(String)
    }
    |
    EFI {
        efi: String
    }
}

We did not have config files for systemd-boot and were only using UKIs
which did not allow proper sorting of the UKIs. This adds .conf files
to $ESP/loader/entries
Preserves UKI addons' names so we don't overwrite previously added addon
Adds a cli option --uki-addon to select the addons to install
Add logic for upgrading/switching to a deployment with systemd-boot as the bootloader

crates/lib/src/install.rs

crates/lib/src/bootc_composefs/status.rs

Johan-Liebert1 · 2025-09-25T05:47:19Z

This was approved, but I think it needs a re-review

Johan-Liebert1 · 2025-09-25T14:28:58Z

@cgwalters This is also up for a re-review. Added a few more commits since the last one

cgwalters

A lot here, I didn't do an exhaustive review. What would probably help here is for us to ensure we're refining something like docs/internals/ for how we're doing some of this.

cgwalters · 2025-09-25T20:14:34Z

crates/lib/src/bootc_composefs/boot.rs

 const EFI_LINUX: &str = "EFI/Linux";

+/// Timeout for systemd-boot bootloader menu
+const SYSTEMD_TIMEOUT: &str = "timeout 5";


This relates to coreos/bootupd#978 - I think the default for systems-boot should actually be set at install time.

Agreed. But, for now at least we keep it in bootc until we have support for systemd-boot in bootupd

crates/lib/src/bootc_composefs/boot.rs

cgwalters · 2025-09-25T20:18:58Z

crates/lib/src/bootc_composefs/repo.rs

    .await
 }

+/// skopeo (in composefs-rs) doesn't understand "registry:"


Yeah...that was something I invented in ostree-ext and probably should have argued to add to the containers-transports so that podman/skopeo/etc understand.

crates/lib/src/bootc_composefs/repo.rs

cgwalters · 2025-09-25T20:20:58Z

crates/lib/src/bootc_composefs/repo.rs

+/// Ex
+/// docker://quay.io/some-image
+/// containers-storage:some-image
+pub(crate) fn get_imgref(transport: &String, image: &String) -> String {


This one looks very unit testable

I haven't followed the flow here but ideally we do youki-dev/oci-spec-rs#205 and then we're always using a parsed representation for these things.

There are two ImageReference structs ostree_ext::container::ImageReference and lib::spec::ImageReference and they I think ostree_ext::container::ImageReference is being converted to lib::spec::ImageReference, but Display for Transport is just "registry"

We should probably combine these throughout the codebase?

crates/lib/src/bootc_composefs/repo.rs

crates/lib/src/bootc_composefs/state.rs

crates/lib/src/parsers/bls_config.rs

This is in prep for adding config files for BLS compliant bootloaders booting via UKI. Adds a field `cfg_type` to BLSConfig which will contain either of the following sets of keys: cfg_type - NonEFI - linux - initrd - options or cfg_type - EFI - efi Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com> Signed-off-by: Colin Walters <walters@verbum.org>

We did not have config files for systemd-boot and were only using UKIs which did not allow proper sorting of the UKIs. This adds .conf files to `$ESP/loader/entries` Also, preserves UKI addons' names so we don't overwrite previously added addon Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com> Signed-off-by: Colin Walters <walters@verbum.org>

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com> Signed-off-by: Colin Walters <walters@verbum.org>

Add logic for upgrading/switching to a deployment with systemd-boot as the bootloader. Also update finalize-staged service to handle systemd-boot bootloader entries for UKIs Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com> Signed-off-by: Colin Walters <walters@verbum.org>

Allows installing only some of the addons depending upon the list of addons passed in as cli options. Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com> Signed-off-by: Colin Walters <walters@verbum.org>

skopeo (in composefs-rs) doesn't understand the transport "registry:", so we convert it to "docker://" when passing it to skopeo Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com> Signed-off-by: Colin Walters <walters@verbum.org>

Use UTF8Path in BLSConfig Use `ok_or_else` so error objects are lazily evaluated Add tests for `get_imgref` Update UKI path for systemd-boot to `EFI/Linux/bootc` Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com> Signed-off-by: Colin Walters <walters@verbum.org>

bootc-bot bot requested a review from jeckersb September 18, 2025 10:36

cgwalters approved these changes Sep 18, 2025

View reviewed changes

crates/lib/src/install.rs Outdated Show resolved Hide resolved

crates/lib/src/bootc_composefs/status.rs Outdated Show resolved Hide resolved

Johan-Liebert1 force-pushed the bls-bootc-status branch 4 times, most recently from 64d4c27 to 5269030 Compare September 22, 2025 10:12

Johan-Liebert1 changed the title ~~Bls bootc status~~ Cleanup systemd UKI support Sep 22, 2025

Johan-Liebert1 force-pushed the bls-bootc-status branch from 5269030 to fcfcf66 Compare September 23, 2025 13:38

Johan-Liebert1 marked this pull request as ready for review September 23, 2025 13:39

Johan-Liebert1 force-pushed the bls-bootc-status branch from fcfcf66 to 2fb37fb Compare September 23, 2025 13:40

Johan-Liebert1 requested a review from cgwalters September 23, 2025 13:47

Johan-Liebert1 force-pushed the bls-bootc-status branch 2 times, most recently from 9c447bf to 8c73037 Compare September 25, 2025 09:05

cgwalters approved these changes Sep 25, 2025

View reviewed changes

Johan-Liebert1 force-pushed the bls-bootc-status branch 3 times, most recently from 9847935 to db4f838 Compare September 26, 2025 11:31

cgwalters enabled auto-merge (rebase) September 27, 2025 11:36

cgwalters approved these changes Sep 27, 2025

View reviewed changes

Johan-Liebert1 added 7 commits September 27, 2025 07:37

composefs-backend: Fix bootc status for systemd-boot

d55ea89

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com> Signed-off-by: Colin Walters <walters@verbum.org>

composefs-backend/boot: Allow passing UKI addons as cli options

e4dc96e

Allows installing only some of the addons depending upon the list of addons passed in as cli options. Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com> Signed-off-by: Colin Walters <walters@verbum.org>

cgwalters force-pushed the bls-bootc-status branch from db4f838 to 1a732db Compare September 27, 2025 11:38

cgwalters merged commit c5131fe into bootc-dev:main Sep 29, 2025
27 checks passed

Cleanup systemd UKI support #1623

Cleanup systemd UKI support #1623

Uh oh!

Conversation

Johan-Liebert1 commented Sep 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Johan-Liebert1 commented Sep 25, 2025

Uh oh!

Johan-Liebert1 commented Sep 25, 2025

Uh oh!

cgwalters left a comment

Choose a reason for hiding this comment

Uh oh!

cgwalters Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

Johan-Liebert1 Sep 26, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

cgwalters Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

cgwalters Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

Johan-Liebert1 Sep 26, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Johan-Liebert1 commented Sep 18, 2025 •

edited

Loading