Skip to content

Conversation

travier
Copy link
Contributor

@travier travier commented Sep 17, 2025

Work in progress for #1614

@bootc-bot bootc-bot bot requested a review from jeckersb September 17, 2025 13:50
@travier travier changed the title examples: Add initial bootc examples (bls & uki) WIP: examples: Add bootc UKI & BLS examples Sep 17, 2025

[features]
default = ["install-to-disk"]
default = ["install-to-disk", "composefs-backend"]
Copy link
Collaborator

Choose a reason for hiding this comment

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

Fine for WIP (I know for example this makes rust-analyzer annoying to work with without it), but we probably don't want to enable this by default quite yet, even though adding these tests goes a long way to increasing our confidence. Maybe let it bake in CI and get early community feedback for a release or two before we turn it on?

&format!("{transport}{image_name}"),
None,
None,
Some(ostree_ext::containers_image_proxy::ImageProxyConfig {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why is this required? Looking at SourceInfo the docs at least claim to always use containers-storage. Either I'm misunderstanding the flow here (very possible!) or there's a mismatch between the docs and what is actually happening.

}

println!("state: {state:#?}");
println!("root_setup: {rootfs:#?}");
Copy link
Collaborator

Choose a reason for hiding this comment

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

Fine for WIP just wanted to note here to remove these (plus one more below) before final merge

@travier travier force-pushed the main-composefs-native-examples branch from 15556ec to d83dffc Compare September 17, 2025 17:10
@travier
Copy link
Contributor Author

travier commented Sep 17, 2025

Agree that we do not want to merge this PR as is right now. This is more place to share progress and the developments scripts we are currently using.

@travier travier force-pushed the main-composefs-native-examples branch from d83dffc to e07b165 Compare September 17, 2025 17:46
/// See https://github.com/containers/composefs-rs/issues/159
// pub type ComposefsRepository =
// composefs::repository::Repository<composefs::fsverity::Sha512HashValue>;
pub type ComposefsRepository =
Copy link
Collaborator

Choose a reason for hiding this comment

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

Per #1190 I think we should change all of the code to use this alias instead

// composefs::repository::Repository<composefs::fsverity::Sha512HashValue>;
pub type ComposefsRepository =
composefs::repository::Repository<composefs::fsverity::Sha512HashValue>;
composefs::repository::Repository<composefs::fsverity::Sha256HashValue>;
Copy link
Collaborator

Choose a reason for hiding this comment

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

And consensus seems to be keeping sha512

@travier travier force-pushed the main-composefs-native-examples branch 2 times, most recently from 6126ae9 to f3dc163 Compare September 22, 2025 14:51
@Johan-Liebert1 Johan-Liebert1 force-pushed the main-composefs-native-examples branch from f3dc163 to 9b17841 Compare September 22, 2025 15:30
@travier travier force-pushed the main-composefs-native-examples branch 4 times, most recently from 3fb6f48 to 3e7e6dd Compare September 22, 2025 21:18
Johan-Liebert1 and others added 13 commits September 25, 2025 11:58
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Allows installing only some of the addons depending upon the list
of addons passed in as cli options.

Signed-off-by: Pragyan Poudyal <[email protected]>
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 <[email protected]>
Co-Authored-By: Pragyan Poudyal <[email protected]>
Co-Authored-By: John Eckersberg <[email protected]>
Signed-off-by: Timothée Ravier <[email protected]>
@travier travier force-pushed the main-composefs-native-examples branch from 488bc5e to 94a53f0 Compare September 25, 2025 15:06
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.

4 participants