Skip to content

Conversation

@Johan-Liebert1
Copy link
Collaborator

This piece was leftover when implementing systemd-boot support for composefs backend

@bootc-bot bootc-bot bot requested a review from henrywang October 22, 2025 05:43
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request adds rollback support for systemd-boot in the composefs backend, which was a missing piece. The changes involve refactoring the rollback logic to be more generic and handle both Grub and systemd-boot. The function renames and improved use of cap-std are good improvements.
My review focuses on a compilation error, a potential panic, and some opportunities for refactoring to improve code clarity and robustness. Overall, this is a good step forward, and with these changes, it will be even better.

@Johan-Liebert1 Johan-Liebert1 force-pushed the sdboot-rollback branch 2 times, most recently from c55ad09 to 7f3c5c5 Compare October 22, 2025 06:06
@Johan-Liebert1
Copy link
Collaborator Author

RPM builds failing with

---- test_unencapsulate_unbootable stdout ----

thread 'test_unencapsulate_unbootable' panicked at crates/ostree-ext/tests/it/main.rs:862:10:
called `Result::unwrap()` on an `Err` value: Importing ostree-unverified-image:oci:/var/tmp/.tmpmXbaHk/oci

Caused by:
    0: Creating importer
    1: Function not implemented (os error 38)

Okay, we already have an issue for this #1692

This piece was leftover when implementing systemd-boot support for
composefs backend

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>

Some refactor

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
Suggested by Gemini

Accept a param `boot_dir`, fd to the boot directory, in function
`rollback_grub_uki_entries`.

Removes hardcoded paths and makes the code a tiny bit cleaner.

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
@cgwalters cgwalters merged commit 8f9155a into bootc-dev:main Oct 24, 2025
36 checks passed
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.

2 participants