wip

Author: jmarrero

crates/lib/src/cli.rs

@@ -935,10 +935,13 @@ async fn upgrade(opts: UpgradeOpts) -> Result<()> {
     } else {
         // Check if image exists in bootc storage (/usr/lib/bootc/storage)
         let imgstore = sysroot.get_ensure_imgstore()?;
-        let use_unified = imgstore
-            .exists(&format!("{imgref:#}"))
-            .await
-            .unwrap_or(false);
+        let use_unified = match imgstore.exists(&format!("{imgref:#}")).await {
+            Ok(v) => v,
+            Err(e) => {
+                tracing::warn!("Failed to check bootc storage for image: {e}; falling back to standard pull");
+                false
+            }
+        };
 
         let fetched = if use_unified {
             crate::deploy::pull_unified(repo, imgref, None, opts.quiet, prog.clone(), sysroot)
@@ -1075,10 +1078,13 @@ async fn switch(opts: SwitchOpts) -> Result<()> {
 
     // Check if image exists in bootc storage (/usr/lib/bootc/storage)
     let imgstore = sysroot.get_ensure_imgstore()?;
-    let use_unified = imgstore
-        .exists(&format!("{target:#}"))
-        .await
-        .unwrap_or(false);
+    let use_unified = match imgstore.exists(&format!("{target:#}")).await {
+        Ok(v) => v,
+        Err(e) => {
+            tracing::warn!("Failed to check bootc storage for image: {e}; falling back to standard pull");
+            false
+        }
+    };
 
     let fetched = if use_unified {
         crate::deploy::pull_unified(repo, &target, None, opts.quiet, prog.clone(), sysroot).await?

crates/lib/src/deploy.rs

@@ -481,7 +481,13 @@ pub(crate) async fn pull_unified(
             Ok(existing)
         }
         PreparedPullResult::Ready(prepared_image_meta) => {
-            pull_from_prepared(imgref, quiet, prog, *prepared_image_meta).await
+            // To avoid duplicate success logs, pass a containers-storage imgref to the importer
+            let cs_imgref = ImageReference {
+                transport: "containers-storage".to_string(),
+                image: imgref.image.clone(),
+                signature: imgref.signature.clone(),
+            };
+            pull_from_prepared(&cs_imgref, quiet, prog, *prepared_image_meta).await
         }
     }
 }
@@ -598,6 +604,9 @@ pub(crate) async fn pull(
     }
 }
 
+/// Pull selecting unified vs standard path based on persistent storage config.
+// pull_auto was reverted per request; keep explicit callers branching.
+
 pub(crate) async fn wipe_ostree(sysroot: Sysroot) -> Result<()> {
     tokio::task::spawn_blocking(move || {
         sysroot

crates/lib/src/image.rs

@@ -207,7 +207,11 @@ 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 = format!("{:#}", imgref);
-    println!(
+    const SET_UNIFIED_JOURNAL_ID: &str = "1a0b9c8d7e6f5a4b3c2d1e0f9a8b7c6d";
+    tracing::info!(
+        message_id = SET_UNIFIED_JOURNAL_ID,
+        bootc.image.reference = &imgref_display.image,
+        bootc.image.transport = &imgref_display.transport,
         "Re-pulling booted image into bootc storage via unified path: {}",
         imgref_display
     );
@@ -226,6 +230,10 @@ pub(crate) async fn set_unified_entrypoint() -> Result<()> {
     let _ = ostree_ext::container::store::ImageImporter::new(repo, &ostree_imgref, Default::default())
         .await?;
 
-    println!("Unified storage set for current image. Future upgrade/switch will use it automatically.");
+    tracing::info!(
+        message_id = SET_UNIFIED_JOURNAL_ID,
+        bootc.status = "set_unified_complete",
+        "Unified storage set for current image. Future upgrade/switch will use it automatically."
+    );
     Ok(())
 }