Merge pull request #399 from cgwalters/more-image-output-cleanup

More image output cleanup

Author: cgwalters

lib/src/deploy.rs

@@ -265,7 +265,7 @@ pub(crate) async fn stage(
     )
     .await?;
     crate::deploy::cleanup(sysroot).await?;
-    println!("Queued for next boot: {}", spec.image);
+    println!("Queued for next boot: {:#}", spec.image);
     if let Some(version) = image.version.as_deref() {
         println!("  Version: {version}");
     }

lib/src/install.rs

@@ -622,13 +622,10 @@ async fn initialize_ostree_root_from_self(
     options.kargs = Some(kargs.as_slice());
     options.target_imgref = Some(&state.target_imgref);
     options.proxy_cfg = proxy_cfg;
-    println!("Creating initial deployment");
-    let target_image = state.target_imgref.to_string();
+    println!("Deploying container image");
     let imgstate =
         ostree_container::deploy::deploy(&sysroot, stateroot, &src_imageref, Some(options)).await?;
-    let digest = imgstate.manifest_digest.as_str();
-    println!("Installed: {target_image}");
-    println!("   Digest: {digest}");
+    println!("Deployment complete");
 
     sysroot.load(cancellable)?;
     let deployment = sysroot
@@ -1048,7 +1045,10 @@ async fn prepare_install(
     let (override_disable_selinux, setenforce_guard) =
         reexecute_self_for_selinux_if_needed(&source, config_opts.disable_selinux)?;
 
-    println!("Installing: {:#}", &target_imgref);
+    println!("Installing image: {:#}", &target_imgref);
+    if let Some(digest) = source.digest.as_deref() {
+        println!("Digest: {digest}");
+    }
 
     let install_config = config::load_config()?;
     tracing::debug!("Loaded install configuration");