install: Quiet output of mkfs.vfat and ostree repo init

Just to make the install process look nicer.

Signed-off-by: Colin Walters <[email protected]>

Author: cgwalters

lib/src/install.rs

@@ -574,11 +574,10 @@ fn install_create_rootfs(state: &State) -> Result<RootSetup> {
 
     // Create the EFI system partition, if applicable
     if let Some(espdev) = espdev {
-        Task::new_and_run(
-            "Creating ESP filesystem",
-            "mkfs.fat",
-            [espdev.as_str(), "-n", "EFI-SYSTEM"],
-        )?;
+        Task::new("Creating ESP filesystem", "mkfs.fat")
+            .args([espdev.as_str(), "-n", "EFI-SYSTEM"])
+            .quiet_output()
+            .run()?;
         let efifs_path = bootfs.join("efi");
         std::fs::create_dir(&efifs_path).context("Creating efi dir")?;
         mount(&espdev, &efifs_path)?;

lib/src/task.rs

@@ -1,5 +1,6 @@
 use std::{
     ffi::OsStr,
+    io::Seek,
     process::{Command, Stdio},
 };
 
@@ -8,6 +9,7 @@ use anyhow::{Context, Result};
 pub(crate) struct Task {
     description: String,
     quiet: bool,
+    quiet_output: bool,
     pub(crate) cmd: Command,
 }
 
@@ -23,6 +25,7 @@ impl Task {
         Self {
             description,
             quiet: false,
+            quiet_output: false,
             cmd,
         }
     }
@@ -32,6 +35,12 @@ impl Task {
         self
     }
 
+    // Do not print stdout/stderr, unless the command fails
+    pub(crate) fn quiet_output(mut self) -> Self {
+        self.quiet_output = true;
+        self
+    }
+
     pub(crate) fn args<S: AsRef<OsStr>>(mut self, args: impl IntoIterator<Item = S>) -> Self {
         self.cmd.args(args);
         self
@@ -44,9 +53,21 @@ impl Task {
         if !self.quiet {
             println!("{description}");
         }
+        let mut output = None;
+        if self.quiet_output {
+            let tmpf = tempfile::tempfile()?;
+            cmd.stdout(Stdio::from(tmpf.try_clone()?));
+            cmd.stderr(Stdio::from(tmpf.try_clone()?));
+            output = Some(tmpf);
+        }
         tracing::debug!("exec: {cmd:?}");
         let st = cmd.status()?;
         if !st.success() {
+            if let Some(mut output) = output {
+                output.seek(std::io::SeekFrom::Start(0))?;
+                let mut stderr = std::io::stderr().lock();
+                std::io::copy(&mut output, &mut stderr)?;
+            }
             anyhow::bail!("Task {description} failed: {st:?}");
         }
         Ok(())