deps: Rename cfsctl workspace dependency to composefs-ctl

The upstream composefs-rs package was renamed from cfsctl to
composefs-ctl in 0.4.0. Update the workspace dependency key to match,
removing the need for the `package` field, and rename all Rust
imports from cfsctl:: to composefs_ctl::.

Assisted-by: OpenCode (claude-opus-4-6)
Signed-off-by: John Eckersberg <jeckersb@redhat.com>

Author: jeckersb

Cargo.toml

@@ -42,9 +42,9 @@ clap = "4.5.4"
 clap_mangen = { version = "0.3.0" }
 # To develop against a local composefs-rs checkout, add a [patch] section at the end of this file:
 #   [patch."https://github.com/composefs/composefs-rs"]
-#   cfsctl = { path = "/path/to/composefs-rs/crates/cfsctl" }
+#   composefs-ctl = { path = "/path/to/composefs-rs/crates/composefs-ctl" }
 # The Justfile will auto-detect these and bind-mount them into container builds.
-cfsctl = { git = "https://github.com/composefs/composefs-rs", rev = "4dd43a107e", package = "composefs-ctl" }
+composefs-ctl = { git = "https://github.com/composefs/composefs-rs", rev = "4dd43a107e" }
 fn-error-context = "0.2.1"
 futures-util = "0.3"
 hex = "0.4.3"

crates/etc-merge/Cargo.toml

@@ -12,7 +12,7 @@ rustix = { workspace = true }
 openssl = { workspace = true }
 hex = { workspace = true }
 tracing = { workspace = true }
-cfsctl = { workspace = true }
+composefs-ctl = { workspace = true }
 fn-error-context = { workspace = true }
 owo-colors = { workspace = true }
 anstream = { workspace = true }

crates/etc-merge/src/lib.rs

@@ -15,10 +15,10 @@ use anyhow::Context;
 use cap_std_ext::cap_std;
 use cap_std_ext::cap_std::fs::{Dir as CapStdDir, MetadataExt, Permissions, PermissionsExt};
 use cap_std_ext::dirext::CapStdExtDirExt;
-use cfsctl::composefs;
 use composefs::fsverity::{FsVerityHashValue, Sha256HashValue, Sha512HashValue};
 use composefs::generic_tree::{Directory, FileSystem, Inode, Leaf, LeafContent, LeafId, Stat};
 use composefs::tree::ImageError;
+use composefs_ctl::composefs;
 use rustix::fs::{
     AtFlags, Gid, Uid, XattrFlags, lgetxattr, llistxattr, lsetxattr, readlinkat, symlinkat,
 };

crates/initramfs/Cargo.toml

@@ -12,7 +12,7 @@ clap = { workspace = true, features = ["std", "help", "usage", "derive"] }
 libc.workspace = true
 rustix.workspace = true
 serde = { workspace = true, features = ["derive"] }
-cfsctl.workspace = true
+composefs-ctl.workspace = true
 toml.workspace = true
 fn-error-context.workspace = true
 bootc-kernel-cmdline =  { path = "../kernel_cmdline", version = "0.0.0" }
@@ -22,5 +22,5 @@ workspace = true
 
 [features]
 default = ['pre-6.15']
-rhel9 = ['cfsctl/rhel9']
-'pre-6.15' = ['cfsctl/pre-6.15']
+rhel9 = ['composefs-ctl/rhel9']
+'pre-6.15' = ['composefs-ctl/pre-6.15']

crates/initramfs/src/lib.rs

@@ -24,15 +24,15 @@ use rustix::{
 
 use serde::Deserialize;
 
-use cfsctl::composefs;
-use cfsctl::composefs_boot;
 use composefs::{
     fsverity::{FsVerityHashValue, Sha512HashValue},
     mount::FsHandle,
     mountcompat::{overlayfs_set_fd, overlayfs_set_lower_and_data_fds, prepare_mount},
     repository::Repository,
 };
 use composefs_boot::cmdline::get_cmdline_composefs;
+use composefs_ctl::composefs;
+use composefs_ctl::composefs_boot;
 
 use fn_error_context::context;
 

crates/lib/Cargo.toml

@@ -35,7 +35,7 @@ chrono = { workspace = true, features = ["serde"] }
 clap = { workspace = true, features = ["derive","cargo"] }
 clap_complete = "4"
 clap_mangen = { workspace = true, optional = true }
-cfsctl = { workspace = true }
+composefs-ctl = { workspace = true }
 fn-error-context = { workspace = true }
 futures-util = { workspace = true }
 hex = { workspace = true }

crates/lib/src/bootc_composefs/backwards_compat/bcompat_boot.rs

@@ -23,7 +23,7 @@ use crate::{
 use anyhow::{Context, Result};
 use camino::Utf8PathBuf;
 use cap_std_ext::{cap_std::fs::Dir, dirext::CapStdExtDirExt};
-use cfsctl::composefs_boot::bootloader::{EFI_ADDON_DIR_EXT, EFI_EXT};
+use composefs_ctl::composefs_boot::bootloader::{EFI_ADDON_DIR_EXT, EFI_EXT};
 use fn_error_context::context;
 use ocidir::cap_std::ambient_authority;
 use rustix::fs::{RenameFlags, fsync, renameat_with};

crates/lib/src/bootc_composefs/boot.rs

@@ -75,9 +75,6 @@ use cap_std_ext::{
     cap_std::{ambient_authority, fs::Dir},
     dirext::CapStdExtDirExt,
 };
-use cfsctl::composefs;
-use cfsctl::composefs_boot;
-use cfsctl::composefs_oci;
 use clap::ValueEnum;
 use composefs::fs::read_file;
 use composefs::fsverity::{FsVerityHashValue, Sha512HashValue};
@@ -87,6 +84,9 @@ use composefs_boot::bootloader::{
     UsrLibModulesVmlinuz, get_boot_resources,
 };
 use composefs_boot::{cmdline::get_cmdline_composefs, os_release::OsReleaseInfo, uki};
+use composefs_ctl::composefs;
+use composefs_ctl::composefs_boot;
+use composefs_ctl::composefs_oci;
 use fn_error_context::context;
 use rustix::{mount::MountFlags, path::Arg};
 use schemars::JsonSchema;

crates/lib/src/bootc_composefs/digest.rs

@@ -9,11 +9,11 @@ use anyhow::{Context, Result};
 use camino::Utf8Path;
 use cap_std_ext::cap_std;
 use cap_std_ext::cap_std::fs::Dir;
-use cfsctl::composefs;
-use cfsctl::composefs_boot;
 use composefs::dumpfile;
 use composefs::fsverity::{Algorithm, FsVerityHashValue};
 use composefs_boot::BootOps as _;
+use composefs_ctl::composefs;
+use composefs_ctl::composefs_boot;
 use tempfile::TempDir;
 
 use crate::store::ComposefsRepository;

crates/lib/src/bootc_composefs/export.rs

@@ -2,9 +2,9 @@ use std::{fs::File, os::fd::AsRawFd};
 
 use anyhow::{Context, Result};
 use cap_std_ext::cap_std::{ambient_authority, fs::Dir};
-use cfsctl::composefs;
-use cfsctl::composefs_oci;
 use composefs::splitstream::SplitStreamData;
+use composefs_ctl::composefs;
+use composefs_ctl::composefs_oci;
 use composefs_oci::open_config;
 use ocidir::{OciDir, oci_spec::image::Platform};
 use ostree_ext::container::Transport;