Update composefs-ctl digest to 0fbc853

Cargo.toml

@@ -48,7 +48,7 @@ clap_mangen = { version = "0.3.0" }
 # pulls), which drags in rustls-webpki/untrusted/webpki-root-certs whose
 # licenses aren't in our cargo-deny allow list. Re-enable once that's sorted.
 # See: https://github.com/bootc-dev/bootc/pull/2295
-composefs-ctl = { git = "https://github.com/composefs/composefs-rs", rev = "0a819c351951864071aa9ec23d6594710bf3173f", default-features = false, features = [
+composefs-ctl = { git = "https://github.com/composefs/composefs-rs", rev = "0fbc853325ff92dbb842e715611bed7ddf9fe169", default-features = false, features = [
     "pre-6.15",
     "pre-6.16",
     "oci",

crates/lib/src/bootc_composefs/boot.rs

@@ -1411,12 +1411,21 @@ pub(crate) async fn setup_composefs_boot(
     let repo = Arc::new(repo);
 
     // Generate the bootable EROFS image (idempotent).
-    let id = composefs_oci::generate_boot_image(&repo, &pull_result.manifest_digest)
-        .context("Generating bootable EROFS image")?;
+    let id = composefs_oci::generate_boot_image(
+        &repo,
+        &pull_result.manifest_digest,
+        &Default::default(),
+    )
+    .context("Generating bootable EROFS image")?;
 
     // Reconstruct the OCI filesystem to discover boot entries (kernel, initramfs, etc.).
-    let fs = composefs_oci::image::create_filesystem(&*repo, &pull_result.config_digest, None)
-        .context("Creating composefs filesystem for boot entry discovery")?;
+    let fs = composefs_oci::image::create_filesystem(
+        &*repo,
+        &pull_result.config_digest,
+        None,
+        &Default::default(),
+    )
+    .context("Creating composefs filesystem for boot entry discovery")?;
     let entries =
         get_boot_resources(&fs, &*repo).context("Extracting boot entries from OCI image")?;
 

crates/lib/src/bootc_composefs/digest.rs

@@ -77,6 +77,7 @@ pub(crate) async fn compute_composefs_digest(
         dirfd,
         std::path::PathBuf::from("."),
         Some(repo.clone()),
+        &Default::default(),
     )
     .await
     .context("Reading container root")?;

crates/lib/src/bootc_composefs/repo.rs

@@ -393,12 +393,21 @@ pub(crate) async fn pull_composefs_repo(
     );
 
     // Generate the bootable EROFS image (idempotent).
-    let id = composefs_oci::generate_boot_image(&repo, &pull_result.manifest_digest)
-        .context("Generating bootable EROFS image")?;
+    let id = composefs_oci::generate_boot_image(
+        &repo,
+        &pull_result.manifest_digest,
+        &Default::default(),
+    )
+    .context("Generating bootable EROFS image")?;
 
     // Get boot entries from the OCI filesystem (untransformed).
-    let fs = create_composefs_filesystem(&*repo, &pull_result.config_digest, None)
-        .context("Creating composefs filesystem for boot entry discovery")?;
+    let fs = create_composefs_filesystem(
+        &*repo,
+        &pull_result.config_digest,
+        None,
+        &Default::default(),
+    )
+    .context("Creating composefs filesystem for boot entry discovery")?;
     let entries =
         get_boot_resources(&fs, &*repo).context("Extracting boot entries from OCI image")?;
 

crates/lib/src/bootc_composefs/update.rs

@@ -142,7 +142,7 @@ pub(crate) fn validate_update(
     let oci_digest: composefs_oci::OciDigest = img_digest
         .parse()
         .with_context(|| format!("Parsing config digest {img_digest}"))?;
-    let mut fs = create_filesystem(repo, &oci_digest, Some(config_verity))?;
+    let mut fs = create_filesystem(repo, &oci_digest, Some(config_verity), &Default::default())?;
     fs.transform_for_boot(&repo)?;
 
     let image_id = fs.compute_image_id(repo.erofs_version());

crates/lib/src/cli.rs

@@ -1962,6 +1962,7 @@ async fn run_from_opt(opt: Opt) -> Result<()> {
                     &repo,
                     &pull_result.config_digest,
                     Some(&pull_result.config_verity),
+                    &Default::default(),
                 )
                 .context("Populating fs")?;
                 fs.transform_for_boot(&repo).context("Preparing for boot")?;