Skip to content

install/flat: Use composefs pipeline for rootfs #2028

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.

Sign up for GitHub

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

Open
ericcurtin wants to merge 1 commit into
base: main
Choose a base branch
from
+553 −33
Open

install/flat: Use composefs pipeline for rootfs #2028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,11 @@ clap_mangen = { version = "0.2.20" }
# If adding/removing crates here, also update docs/Dockerfile.mdbook and docs/src/internals.md.
#
# To develop against a local composefs-rs checkout, add a [patch] section at the end of this file:
# [patch."https://github.com/containers/composefs-rs"]
# [patch."https://github.com/composefs/composefs-rs"]
# composefs = { path = "/home/user/src/composefs-rs/crates/composefs" }
# composefs-boot = { path = "/home/user/src/composefs-rs/crates/composefs-boot" }
# composefs-oci = { path = "/home/user/src/composefs-rs/crates/composefs-oci" }
# cfsctl = { path = "/home/user/src/composefs-rs/crates/cfsctl" }
# The Justfile will auto-detect these and bind-mount them into container builds.
composefs = { git = "https://github.com/composefs/composefs-rs", rev = "b928c6bd6c051e111d3efc3d25cdaf9159182ed0", package = "composefs", features = ["rhel9"] }
cfsctl = { git = "https://github.com/composefs/composefs-rs", rev = "b928c6bd6c051e111d3efc3d25cdaf9159182ed0", package = "cfsctl", features = ["rhel9"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/lib/src/bootc_composefs/boot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ pub(crate) fn setup_composefs_bls_boot(
let (config_path, booted_bls) = if is_upgrade {
let boot_dir = Dir::open_ambient_dir(&entry_paths.config_path, ambient_authority())?;

let mut booted_bls = get_booted_bls(&boot_dir)?;
let mut booted_bls: BLSConfig = get_booted_bls(&boot_dir)?;
booted_bls.sort_key = Some(secondary_sort_key(&os_id));

let staged_path = loader_path.join(STAGED_BOOT_LOADER_ENTRIES);
Expand Down
Loading