Skip to content

ostree-ext: Add bootc feature #1059

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ anyhow = { workspace = true }
bootc-utils = { path = "../utils" }
bootc-blockdev = { path = "../blockdev" }
camino = { workspace = true, features = ["serde1"] }
ostree-ext = { path = "../ostree-ext" }
ostree-ext = { path = "../ostree-ext", features = ["bootc"] }
chrono = { workspace = true, features = ["serde"] }
clap = { workspace = true, features = ["derive","cargo"] }
clap_mangen = { workspace = true, optional = true }
Expand Down
2 changes: 2 additions & 0 deletions ostree-ext/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ features = ["dox"]
docgen = ["clap_mangen"]
dox = ["ostree/dox"]
internal-testing-api = ["xshell", "indoc", "similar-asserts"]
# Enable calling back into bootc
bootc = []

[lints]
workspace = true
3 changes: 3 additions & 0 deletions ostree-ext/src/container/deploy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ pub async fn deploy(
// crates. We need an option to skip though so when the *main*
// bootc install code calls this API, we don't do this as it
// will have already been handled.
// Note also we do this under a feature gate to ensure rpm-ostree
// doesn't try to invoke this, as that won't work right now.
#[cfg(feature = "bootc")]
if !options.skip_completion {
// Note that the sysroot is provided as `.` but we use cwd_dir to
// make the process current working directory the sysroot.
Expand Down
Loading