Repository navigation
Uki addons followup - #2619
Merged
Merged
Uki addons followup#2619
Conversation
This prevents us from failing on aboot booted systems that might not have a `/boot` directory in the EROFS Ref: bootc-dev#2598 Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
Johan-Liebert1
requested review from
jmarrero
and
a balanced review from Copilot
November 2, 2026 09:00
There was a problem hiding this comment.
🟡 Changes recommended
The existing UKI test still expects None for a missing .cmdline section, but find_kernel now returns Some(Cmdline::new()), causing the test to fail.
1 open issue
What changed in this PR
This PR addresses part of #2598 by limiting UKI artifact cleanup to UKI-booted systems and moving addon command-line validation into install preparation.
Changes:
- Skip UKI artifact garbage collection on other boot types and replace dumpfile parsing panics with contextual errors.
- Validate selected UKI addons before installation changes the filesystem, rejecting disallowed composefs arguments.
- Update kernel-discovery callers for optional addon validation and remove obsolete commented-out code.
| File | Description |
|---|---|
crates/lib/src/status.rs |
Keep container inspection independent of addon validation. |
crates/lib/src/kernel.rs |
Add addon command-line validation and merging during kernel discovery. |
crates/lib/src/install.rs |
Enable addon validation during install preparation. |
crates/lib/src/container_export.rs |
Adapt kernel relocation to the updated discovery signature. |
crates/lib/src/bootc_composefs/gc.rs |
Isolate UKI artifact cleanup and run it only for UKI boots. |
crates/lib/src/bootc_composefs/boot.rs |
Remove obsolete commented-out code. |
crates/lib/src/boot_artifact.rs |
Adapt boot artifact preparation to the updated discovery signature. |
Review effort: Balanced
Instead of failing after pulling in the repo and making all the filesystem changes, check during install prep if we have multiple duplicate composefs cmdlines in UKI Addons and make sure we don't have any composefs cmdline in any global UKI Addon Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
Johan-Liebert1
force-pushed
the
uki-addons-followup
branch
from
November 2, 2026 09:18
c3ff277 to
62eaf43
Compare
jmarrero
enabled auto-merge (rebase)
November 4, 2026 03:28
jmarrero
approved these changes
Nov 4, 2026
jmarrero
left a comment
jmarrero
left a comment
Contributor
There was a problem hiding this comment.
lgtm, we keep iterating on the feature as it's experimental.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
gc: Only GC UKI Artifacts if boot type is UKI
This prevents us from failing on aboot booted systems that might not
have a
/bootdirectory in the EROFSRef: #2598
prepare-install: Check for composefs cmdline in UKI Addons
Instead of failing after pulling in the repo and making all the
filesystem changes, check during install prep if we have multiple
duplicate composefs cmdlines in UKI Addons and make sure we don't have
any composefs cmdline in any global UKI Addon
Closes: #2598