Bump composefs-rs

Signed-off-by: Pragyan Poudyal <[email protected]>

Author: Johan-Liebert1

Cargo.lock

@@ -41,11 +41,14 @@ use fn_error_context::context;
 use ostree::gio;
 use ostree_ext::composefs::{
     fsverity::{FsVerityHashValue, Sha256HashValue},
-    oci::image::create_filesystem as create_composefs_filesystem,
-    oci::pull as composefs_oci_pull,
     repository::Repository as ComposefsRepository,
     util::Sha256Digest,
-    write_boot::write_boot_simple as composefs_write_boot_simple,
+};
+use ostree_ext::composefs_boot::{
+    write_boot::write_boot_simple as composefs_write_boot_simple, BootOps,
+};
+use ostree_ext::composefs_oci::{
+    image::create_filesystem as create_composefs_filesystem, pull as composefs_oci_pull,
 };
 use ostree_ext::oci_spec;
 use ostree_ext::ostree;
@@ -1521,9 +1524,11 @@ fn setup_composefs_boot(root_setup: &RootSetup, state: &State, image_id: &str) -
     )?;
 
     // Add the user grug cfg
+    // TODO: We don't need this for BLS. Have a flag for BLS vs UKI, or maybe we can figure it out
+    // via the boot entries above
     let grub_user_config = format!(
-r#"
-menuentry "Some Fedora Idk" {{
+        r#"
+menuentry "Some Fedora" {{
     insmod fat
     insmod chain
     search --no-floppy --set=root --fs-uuid {rootfs_uuid}

lib/src/install.rs

@@ -20,7 +20,11 @@ ostree = { features = ["v2025_1"], version = "0.20.0" }
 anyhow = { workspace = true }
 bootc-utils = { path = "../utils" }
 camino = { workspace = true, features = ["serde1"] }
-composefs = { git = "https://github.com/containers/composefs-rs", rev = "b1bd9c1d253c9b15bbf8e04068ad96edd974ccd0" }
+
+composefs = { git = "https://github.com/containers/composefs-rs", rev = "2a71e03791a50f7c254b98b20b70b9ab3c0ca997", package = "composefs" }
+composefs-boot = { git = "https://github.com/containers/composefs-rs", rev = "2a71e03791a50f7c254b98b20b70b9ab3c0ca997", package = "composefs-boot" }
+composefs-oci = { git = "https://github.com/containers/composefs-rs", rev = "2a71e03791a50f7c254b98b20b70b9ab3c0ca997", package = "composefs-oci" }
+
 chrono = { workspace = true }
 olpc-cjson = "0.1.1"
 clap = { workspace = true, features = ["derive","cargo"] }

ostree-ext/Cargo.toml

@@ -17,6 +17,8 @@
 // "Dependencies are re-exported".  Users will need e.g. `gio::File`, so this avoids
 // them needing to update matching versions.
 pub use composefs;
+pub use composefs_boot;
+pub use composefs_oci;
 pub use containers_image_proxy;
 pub use containers_image_proxy::oci_spec;
 pub use ostree;