wip

Author: jmarrero

crates/lib/src/image.rs

@@ -207,8 +207,6 @@ pub(crate) async fn set_unified_entrypoint() -> Result<()> {
     // Pull the image from its original source into bootc storage using LBI machinery
     let imgstore = sysroot.get_ensure_imgstore()?;
 
-    let img_string = crate::utils::imageref_to_container_ref(imgref);
-
     const SET_UNIFIED_JOURNAL_ID: &str = "1a0b9c8d7e6f5a4b3c2d1e0f9a8b7c6d";
     tracing::info!(
         message_id = SET_UNIFIED_JOURNAL_ID,
@@ -217,9 +215,19 @@ pub(crate) async fn set_unified_entrypoint() -> Result<()> {
         "Re-pulling booted image into bootc storage via unified path: {}",
         imgref_display
     );
-    imgstore
-        .pull(&img_string, crate::podstorage::PullMode::Always)
-        .await?;
+
+    // If the image is already in containers-storage, copy it from the default storage
+    // to bootc storage. Otherwise, pull it from the original source.
+    if imgref.transport == "containers-storage" {
+        imgstore
+            .pull_from_host_storage(&imgref.image)
+            .await?;
+    } else {
+        let img_string = crate::utils::imageref_to_container_ref(imgref);
+        imgstore
+            .pull(&img_string, crate::podstorage::PullMode::Always)
+            .await?;
+    }
 
     // Optionally verify we can import from containers-storage by preparing in a temp importer
     // without actually importing into the main repo; this is a lightweight validation.