Skip to content

Commit 4fc39c3

Browse files
Johan-Liebert1cgwalters
authored andcommitted
cli/cfsctl: Use proxy from composefs-rs
Now that we have cfsctl as a library, we simply use that to proxy all of our `bootc internal cfs` commands. Cleans up the codebase a bit, DRYs it and keeps things in sync Signed-off-by: Johan-Liebert1 <pragyanpoudyal41999@gmail.com>
1 parent 17947f8 commit 4fc39c3

6 files changed

Lines changed: 54 additions & 393 deletions

File tree

Cargo.lock

Lines changed: 51 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ clap_mangen = { version = "0.2.20" }
5050
# composefs-oci = { path = "/home/user/src/composefs-rs/crates/composefs-oci" }
5151
# The Justfile will auto-detect these and bind-mount them into container builds.
5252
composefs = { git = "https://github.com/composefs/composefs-rs", rev = "b928c6bd6c051e111d3efc3d25cdaf9159182ed0", package = "composefs", features = ["rhel9"] }
53+
cfsctl = { git = "https://github.com/composefs/composefs-rs", rev = "b928c6bd6c051e111d3efc3d25cdaf9159182ed0", package = "cfsctl", features = ["rhel9"] }
5354
composefs-boot = { git = "https://github.com/composefs/composefs-rs", rev = "b928c6bd6c051e111d3efc3d25cdaf9159182ed0", package = "composefs-boot" }
5455
composefs-oci = { git = "https://github.com/composefs/composefs-rs", rev = "b928c6bd6c051e111d3efc3d25cdaf9159182ed0", package = "composefs-oci" }
5556
fn-error-context = "0.2.1"

crates/lib/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ clap = { workspace = true, features = ["derive","cargo"] }
3636
clap_complete = "4"
3737
clap_mangen = { workspace = true, optional = true }
3838
composefs = { workspace = true }
39+
cfsctl = { workspace = true }
3940
composefs-boot = { workspace = true }
4041
composefs-oci = { workspace = true }
4142
fn-error-context = { workspace = true }

0 commit comments

Comments
 (0)