Move bootc_has_clean out of reinstall_command and into run() in

main.rs, so the pull and capability-check steps are clearly distinct and sequenced

Signed-off-by: Juan Gomez <1766933+judavi@users.noreply.github.com>

Author: judavi

crates/system-reinstall-bootc/src/main.rs

@@ -5,6 +5,7 @@ use bootc_utils::CommandRunExt;
 use clap::Parser;
 use fn_error_context::context;
 use rustix::process::getuid;
+use std::time::Duration;
 
 mod btrfs;
 mod config;
@@ -54,11 +55,24 @@ fn run() -> Result<()> {
 
     podman::ensure_podman_installed()?;
 
-    //pull image early so it can be inspected, e.g. to check for cloud-init
+    // Pull phase: explicitly pull the image before any other operations that use it.
+    // This ensures no implicit pulls happen in later steps (e.g. capability check).
     podman::pull_if_not_present(&opts.image)?;
 
     println!();
 
+    // Capability check phase: run after the image is guaranteed to be present locally.
+    let spinner = indicatif::ProgressBar::new_spinner();
+    spinner.set_style(
+        indicatif::ProgressStyle::default_spinner()
+            .template("{spinner} {msg}")
+            .expect("Failed to parse spinner template"),
+    );
+    spinner.set_message("Checking image capabilities...");
+    spinner.enable_steady_tick(Duration::from_millis(150));
+    let has_clean = podman::bootc_has_clean(&opts.image)?;
+    spinner.finish_and_clear();
+
     let ssh_key_file = tempfile::NamedTempFile::new()?;
     let ssh_key_file_path = ssh_key_file
         .path()
@@ -71,7 +85,8 @@ fn run() -> Result<()> {
 
     prompt::mount_warning()?;
 
-    let mut reinstall_podman_command = podman::reinstall_command(&opts, ssh_key_file_path)?;
+    let mut reinstall_podman_command =
+        podman::reinstall_command(&opts, ssh_key_file_path, has_clean)?;
 
     println!();
     println!("Going to run command:");

crates/system-reinstall-bootc/src/podman.rs

@@ -4,12 +4,11 @@ use super::ROOT_KEY_MOUNT_POINT;
 use anyhow::{Context, Result, ensure};
 use bootc_utils::CommandRunExt;
 use fn_error_context::context;
-use std::time::Duration;
 use std::process::Command;
 use which::which;
 
 #[context("bootc_has_clean")]
-fn bootc_has_clean(image: &str) -> Result<bool> {
+pub(crate) fn bootc_has_clean(image: &str) -> Result<bool> {
     let output = Command::new("podman")
         .args([
             "run",
@@ -26,7 +25,11 @@ fn bootc_has_clean(image: &str) -> Result<bool> {
 }
 
 #[context("reinstall_command")]
-pub(crate) fn reinstall_command(opts: &ReinstallOpts, ssh_key_file: &str) -> Result<Command> {
+pub(crate) fn reinstall_command(
+    opts: &ReinstallOpts,
+    ssh_key_file: &str,
+    has_clean: bool,
+) -> Result<Command> {
     let mut podman_command_and_args = [
         // We use podman to run the bootc container. This might change in the future to remove the
         // podman dependency.
@@ -81,16 +84,6 @@ pub(crate) fn reinstall_command(opts: &ReinstallOpts, ssh_key_file: &str) -> Res
     // bootc system for the first time.
     // This only happens if the bootc version in the image >= 1.1.8 (this is when the cleanup
     // feature was introduced)
-    let spinner = indicatif::ProgressBar::new_spinner();
-    spinner.set_style(
-        indicatif::ProgressStyle::default_spinner()
-            .template("{spinner} {msg}")
-            .unwrap(),
-    );
-    spinner.set_message("Checking image capabilities...");
-    spinner.enable_steady_tick(Duration::from_millis(150));
-    let has_clean = bootc_has_clean(&opts.image)?;
-    spinner.finish_and_clear();
     if has_clean {
         bootc_command_and_args.push("--cleanup".to_string());
     }