wip

Author: jmarrero

crates/lib/src/cli.rs

@@ -948,7 +948,7 @@ async fn upgrade(
         }
     } else {
         // Check if image exists in bootc storage (/usr/lib/bootc/storage)
-        let imgstore = sysroot.get_ensure_imgstore()?;
+        let imgstore = storage.get_ensure_imgstore()?;
 
         let image_ref_str = crate::utils::imageref_to_container_ref(imgref);
 
@@ -963,7 +963,7 @@ async fn upgrade(
         };
 
         let fetched = if use_unified {
-            crate::deploy::pull_unified(repo, imgref, None, opts.quiet, prog.clone(), sysroot)
+            crate::deploy::pull_unified(repo, imgref, None, opts.quiet, prog.clone(), storage)
                 .await?
         } else {
             crate::deploy::pull(repo, imgref, None, opts.quiet, prog.clone()).await?
@@ -1082,7 +1082,7 @@ async fn switch_ostree(
     let new_spec = RequiredHostSpec::from_spec(&new_spec)?;
 
     // Check if image exists in bootc storage (/usr/lib/bootc/storage)
-    let imgstore = sysroot.get_ensure_imgstore()?;
+    let imgstore = storage.get_ensure_imgstore()?;
 
     let target_ref_str = crate::utils::imageref_to_container_ref(&target);
 
@@ -1097,7 +1097,7 @@ async fn switch_ostree(
     };
 
     let fetched = if use_unified {
-        crate::deploy::pull_unified(repo, &target, None, opts.quiet, prog.clone(), sysroot).await?
+        crate::deploy::pull_unified(repo, &target, None, opts.quiet, prog.clone(), storage).await?
     } else {
         crate::deploy::pull(repo, &target, None, opts.quiet, prog.clone()).await?
     };

crates/lib/src/deploy.rs

@@ -93,6 +93,17 @@ pub(crate) async fn new_importer(
     Ok(imp)
 }
 
+/// Wrapper for pulling a container image with a custom proxy config (e.g. for unified storage).
+pub(crate) async fn new_importer_with_config(
+    repo: &ostree::Repo,
+    imgref: &ostree_container::OstreeImageReference,
+    config: ostree_ext::containers_image_proxy::ImageProxyConfig,
+) -> Result<ostree_container::store::ImageImporter> {
+    let mut imp = ostree_container::store::ImageImporter::new(repo, imgref, config).await?;
+    imp.require_bootable();
+    Ok(imp)
+}
+
 pub(crate) fn check_bootc_label(config: &ostree_ext::oci_spec::image::ImageConfiguration) {
     if let Some(label) =
         labels_of_config(config).and_then(|labels| labels.get(crate::metadata::BOOTC_COMPAT_LABEL))
@@ -414,8 +425,17 @@ pub(crate) async fn prepare_for_pull_unified(
     };
     let ostree_imgref = OstreeImageReference::from(containers_storage_imgref);
 
-    // Use the standard preparation flow but reading from containers-storage
-    let mut imp = new_importer(repo, &ostree_imgref).await?;
+    // Configure the importer to use bootc storage as an additional image store
+    use std::process::Command;
+    let mut config = ostree_ext::containers_image_proxy::ImageProxyConfig::default();
+    let mut cmd = Command::new("skopeo");
+    // Use the actual physical path to bootc storage, not the alias
+    let storage_path = format!("/sysroot/{}", crate::podstorage::CStorage::subpath());
+    crate::podstorage::set_additional_image_store(&mut cmd, &storage_path);
+    config.skopeo_cmd = Some(cmd);
+
+    // Use the preparation flow with the custom config
+    let mut imp = new_importer_with_config(repo, &ostree_imgref, config).await?;
     if let Some(target) = target_imgref {
         imp.set_target(target);
     }

crates/lib/src/podstorage.rs

@@ -387,7 +387,7 @@ impl CStorage {
         Ok(())
     }
 
-    fn subpath() -> Utf8PathBuf {
+    pub(crate) fn subpath() -> Utf8PathBuf {
         Utf8Path::new(crate::store::BOOTC_ROOT).join(SUBPATH)
     }
 }

crates/lib/src/utils.rs

@@ -277,6 +277,18 @@ pub(crate) fn path_relative_to(from: &Path, to: &Path) -> Result<PathBuf> {
     return Ok(final_path);
 }
 
+/// Converts an ImageReference to a container reference string suitable for use with container storage APIs.
+/// For registry transport, returns just the image name. For other transports, prepends the transport.
+pub(crate) fn imageref_to_container_ref(imgref: &crate::spec::ImageReference) -> String {
+    if imgref.transport == "registry" {
+        // For registry transport, the image name is already in the right format
+        imgref.image.clone()
+    } else {
+        // For other transports (containers-storage, oci, etc.), prepend the transport
+        format!("{}:{}", imgref.transport, imgref.image)
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -337,4 +349,39 @@ mod tests {
         assert!(have_executable("true").unwrap());
         assert!(!have_executable("someexethatdoesnotexist").unwrap());
     }
+
+    #[test]
+    fn test_imageref_to_container_ref() {
+        use crate::spec::ImageReference;
+
+        // Test registry transport (should return only the image name)
+        let registry_ref = ImageReference {
+            transport: "registry".to_string(),
+            image: "quay.io/example/foo:latest".to_string(),
+            signature: None,
+        };
+        assert_eq!(
+            imageref_to_container_ref(&registry_ref),
+            "quay.io/example/foo:latest"
+        );
+
+        // Test containers-storage transport
+        let storage_ref = ImageReference {
+            transport: "containers-storage".to_string(),
+            image: "localhost/bootc".to_string(),
+            signature: None,
+        };
+        assert_eq!(
+            imageref_to_container_ref(&storage_ref),
+            "containers-storage:localhost/bootc"
+        );
+
+        // Test oci transport
+        let oci_ref = ImageReference {
+            transport: "oci".to_string(),
+            image: "/path/to/image".to_string(),
+            signature: None,
+        };
+        assert_eq!(imageref_to_container_ref(&oci_ref), "oci:/path/to/image");
+    }
 }

tmt/plans/integration.fmf

@@ -119,3 +119,17 @@ execute:
     how: fmf
     test:
         - /tmt/tests/test-28-factory-reset
+
+/test-29-install-unified-flag:
+  summary: Verify install help exposes experimental unified storage flag
+  discover:
+    how: fmf
+    test:
+        - /tmt/tests/test-28-install-unified-flag
+
+/test-30-switch-to-unified:
+  summary: Onboard to unified storage and verify subsequent operations use it
+  discover:
+    how: fmf
+    test:
+        - /tmt/tests/test-29-switch-to-unified