Skip to content

Commit bad25cd

Browse files
committed
install/flat: Use composefs pipeline for rootfs and related changes
- Use composefs-rs for SELinux labeling and kernel installation - Implement streaming copy for kernel/initramfs files - Consolidate bootloader installation logic - Add /usr overlay status tracking - Various test and documentation updates Note: blockdev.rs and ADOPTERS.md changes moved to separate PRs per review feedback Assisted-by: Claude Code (Opus) Signed-off-by: Eric Curtin <eric.curtin@docker.com>
1 parent e73cc96 commit bad25cd

File tree

15 files changed

+553
-33
lines changed

15 files changed

+553
-33
lines changed

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@ clap_mangen = { version = "0.2.20" }
4444
# If adding/removing crates here, also update docs/Dockerfile.mdbook and docs/src/internals.md.
4545
#
4646
# To develop against a local composefs-rs checkout, add a [patch] section at the end of this file:
47-
# [patch."https://github.com/containers/composefs-rs"]
47+
# [patch."https://github.com/composefs/composefs-rs"]
4848
# composefs = { path = "/home/user/src/composefs-rs/crates/composefs" }
4949
# composefs-boot = { path = "/home/user/src/composefs-rs/crates/composefs-boot" }
5050
# composefs-oci = { path = "/home/user/src/composefs-rs/crates/composefs-oci" }
51+
# cfsctl = { path = "/home/user/src/composefs-rs/crates/cfsctl" }
5152
# The Justfile will auto-detect these and bind-mount them into container builds.
5253
composefs = { git = "https://github.com/composefs/composefs-rs", rev = "b928c6bd6c051e111d3efc3d25cdaf9159182ed0", package = "composefs", features = ["rhel9"] }
5354
cfsctl = { git = "https://github.com/composefs/composefs-rs", rev = "b928c6bd6c051e111d3efc3d25cdaf9159182ed0", package = "cfsctl", features = ["rhel9"] }

crates/lib/src/bootc_composefs/boot.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,7 @@ pub(crate) fn setup_composefs_bls_boot(
730730
let (config_path, booted_bls) = if is_upgrade {
731731
let boot_dir = Dir::open_ambient_dir(&entry_paths.config_path, ambient_authority())?;
732732

733-
let mut booted_bls = get_booted_bls(&boot_dir)?;
733+
let mut booted_bls: BLSConfig = get_booted_bls(&boot_dir)?;
734734
booted_bls.sort_key = Some(secondary_sort_key(&os_id));
735735

736736
let staged_path = loader_path.join(STAGED_BOOT_LOADER_ENTRIES);

0 commit comments

Comments
 (0)