composefs-native/uki: Handle UKI addons #1573

Johan-Liebert1 · 2025-09-02T10:23:36Z

If we find UKI addons in the boot entries list, write them to ESP along with the UKI

Right now if a UKI Addon also has the composefs= cmdline param, it's ignored.

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

Signed-off-by: Colin Walters <walters@verbum.org>

Parse the Grub menuentry file, `boot/grub2/user.cfg` to get a list of bootable UKIs and figure out if a rollback is currently queued. Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

Returning a local reference to a `&str` is quite tricky with rust. Update `title` and `chainloader`, the two dynamic fields in the grub menuentry, to be `String` instead of `&str` Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

We parse the grub menuentries, get the rollback deployment then perform the rollback, which basically consists of writing a new .staged menuentry file then atomically swapping the staged and the current menuentry. Rollback while there is a staged deployment is still to be handled. Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

…iles Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

If two deployments have the same VMLinuz + Initrd then, we can use the same binaries for both the deployments. Before writing the BLS entries to disk we calculate the SHA256Sum of VMLinuz + Initrd combo, then test if any other deployment has the same SHA256Sum for the binaries. Store the hash in the origin file under `boot -> hash` for future lookups. Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

Centralize all constants in a separate file Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

Instead of `/sysroot/state/os/fedora` use `/sysroot/state/os/default` as the default state directory. Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

Instaed of writing all present menuentries, only write the menuentry for switch/upgrade and the menuentry for the currently booted deployment. Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

This allows for easier testing Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>

Add tests for functions `get_sorted_bls_boot_entries` and `get_sorted_uki_boot_entries` Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>

Just reducing code here.

Signed-off-by: Colin Walters <walters@verbum.org>

The duplication between this and composefs-boot is high and we need to squash it; an important step there would probably be lowering the karg parsing. Signed-off-by: Colin Walters <walters@verbum.org>

Signed-off-by: Robert Sturla <robertsturla@outlook.com> install: create temporary directory for ESP bls mount Plus additional review comments: - Created constant for EFI/LINUX - Switched from Task to Command - Create efi_dir as Utf8PathBuf Signed-off-by: Robert Sturla <robertsturla@outlook.com>

- Use `read_file` from `composefs::fs` - Always define `mod parsers` - Re-alphabetize/group module definitions Signed-off-by: John Eckersberg <jeckersb@redhat.com>

Fill `version` field in generated BLS config Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

composefs/install/bls: Fix empty version in config

For bind mounting /etc we copy the contents of the EROFS' /etc to the deployment's state directory Mounting the EORFS requires help from the initramfs crate, so we also turn it into a library crate. Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

composefs/install: Copy /etc contents to state

If we find UKI addons in the boot entries list, write them to ESP along with the UKI Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

Johan-Liebert1 · 2025-09-02T10:24:35Z

I thought needs-ok-to-test skipped CI as the CI won't currently pass anyway

gemini-code-assist

Code Review

This pull request refactors the UKI boot setup to handle UKI addons by processing a list of boot entries instead of a single one. A new helper function, write_pe_to_esp, is introduced to encapsulate writing PE files to the ESP, which is a good separation of concerns. The changes are generally well-structured and address the goal of handling UKI addons. I've identified a couple of areas for improvement regarding code consistency and robustness. My detailed feedback is in the comments below.

gemini-code-assist · 2025-09-02T10:25:39Z

crates/lib/src/cli.rs

@@ -1143,10 +1143,10 @@ async fn switch_composefs(opts: SwitchOpts) -> Result<()> {
                BootSetupType::Upgrade(&fs),
                repo,
                &id,
-                entry,
+                &entry,


The call to setup_composefs_bls_boot here uses &entry, but a similar call in upgrade_composefs (line 961) uses entry. In both functions, entry is of type &ComposefsBootEntry. While using &entry works due to auto-dereferencing, for consistency and clarity it would be better to use entry in both places.

entry,

gemini-code-assist · 2025-09-02T10:25:40Z

crates/lib/src/install.rs

+    create_dir_all(&efi_linux_path).context("Creating EFI/Linux")?;
+
+    let final_pe_path = if let Some(parent) = file_path.parent() {
+        let renamed_path = if parent.as_str()?.ends_with(EFI_ADDON_DIR_EXT) {


Using parent.as_str()? could lead to an error if the path contains non-UTF-8 characters. It's safer and cleaner to use parent.ends_with(), which operates directly on &Path and avoids the need for string conversion.

Suggested change

let renamed_path = if parent.as_str()?.ends_with(EFI_ADDON_DIR_EXT) {

let renamed_path = if parent.ends_with(EFI_ADDON_DIR_EXT) {

Johan-Liebert1 and others added 27 commits August 29, 2025 17:05

WIP: composefs backend

2bd9e4c

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

Rework composefs_booted to use kernel cmdline

c45dab5

Signed-off-by: Colin Walters <walters@verbum.org>

composefs/status: Read UKI entries to check for queued rollback

d562f07

Parse the Grub menuentry file, `boot/grub2/user.cfg` to get a list of bootable UKIs and figure out if a rollback is currently queued. Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

parser/grub: Use String instead of &str

839b858

Returning a local reference to a `&str` is quite tricky with rust. Update `title` and `chainloader`, the two dynamic fields in the grub menuentry, to be `String` instead of `&str` Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

composefs/state: Use atomic writes for origin and staged deployment f…

e95af76

…iles Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

parser/bls: impl Display for BLSConfig

7e05aa6

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

lib/composefs: Centralize constants

a6bcfbe

Centralize all constants in a separate file Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

composefs/state: Name state directory default

f2d77c1

Instead of `/sysroot/state/os/fedora` use `/sysroot/state/os/default` as the default state directory. Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

parser/bls: Add tests for bls parser

1425225

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

install/composefs/uki: Write only staged + booted menuentry on upgrade

e9206ff

Instaed of writing all present menuentries, only write the menuentry for switch/upgrade and the menuentry for the currently booted deployment. Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

rollback/composefs: Print whether we are reverting the queued rollback

64f5ec3

Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

refactor: Pass boot dir to boot entry readers

f3ab5b3

This allows for easier testing Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>

test: Add tests for reading boot entries

f65d5dd

Add tests for functions `get_sorted_bls_boot_entries` and `get_sorted_uki_boot_entries` Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>

Drop duplicate bls_config

0fb6edd

install: Use read_file from composefs-boot

01bade0

Just reducing code here.

install: Fix cargo fmt

7435396

Signed-off-by: Colin Walters <walters@verbum.org>

status: Use constant for composefs

a324f58

Signed-off-by: Colin Walters <walters@verbum.org>

status: Enhance composefs cmdline parsing to handle ?

705eaf8

The duplication between this and composefs-boot is high and we need to squash it; an important step there would probably be lowering the karg parsing. Signed-off-by: Colin Walters <walters@verbum.org>

Post-rebase fixups:

b45ef30

- Use `read_file` from `composefs::fs` - Always define `mod parsers` - Re-alphabetize/group module definitions Signed-off-by: John Eckersberg <jeckersb@redhat.com>

composefs/install/bls: Fix empty version in config

a8313cb

Fill `version` field in generated BLS config Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

Merge pull request bootc-dev#1558 from Johan-Liebert1/bls-version-fix

d7adf7d

composefs/install/bls: Fix empty version in config

Merge pull request bootc-dev#1560 from Johan-Liebert1/bind-mnt-etc

fd703ec

composefs/install: Copy /etc contents to state

composefs-native/uki: Handle UKI addons

5a03150

If we find UKI addons in the boot entries list, write them to ESP along with the UKI Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>

Johan-Liebert1 added the needs-ok-to-test label Sep 2, 2025

bootc-bot bot requested a review from cgwalters September 2, 2025 10:23

gemini-code-assist bot reviewed Sep 2, 2025

View reviewed changes

Johan-Liebert1 marked this pull request as draft September 2, 2025 10:28

jeckersb force-pushed the composefs-backend branch from fd703ec to 023be10 Compare September 3, 2025 21:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

composefs-native/uki: Handle UKI addons #1573

composefs-native/uki: Handle UKI addons #1573

Uh oh!

Johan-Liebert1 commented Sep 2, 2025 •

edited by cgwalters

Loading

Uh oh!

Johan-Liebert1 commented Sep 2, 2025

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

gemini-code-assist bot Sep 2, 2025

Uh oh!

gemini-code-assist bot Sep 2, 2025

Uh oh!

Uh oh!

	let renamed_path = if parent.as_str()?.ends_with(EFI_ADDON_DIR_EXT) {
	let renamed_path = if parent.ends_with(EFI_ADDON_DIR_EXT) {

composefs-native/uki: Handle UKI addons #1573

Are you sure you want to change the base?

composefs-native/uki: Handle UKI addons #1573

Uh oh!

Conversation

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

Uh oh!

Uh oh!

Johan-Liebert1 commented Sep 2, 2025

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist bot Sep 2, 2025

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Sep 2, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Johan-Liebert1 commented Sep 2, 2025 •

edited by cgwalters

Loading