feat: add stages for long running postinstall sections

Author: lleyton

src/backend/postinstall/dracut.rs

@@ -1,3 +1,5 @@
+use crate::stage;
+
 use super::{Context, PostInstallModule};
 use color_eyre::{eyre::bail, Result};
 use serde::{Deserialize, Serialize};
@@ -8,29 +10,31 @@ pub struct Dracut;
 
 impl PostInstallModule for Dracut {
     fn run(&self, _context: &Context) -> Result<()> {
-        // We assume the installation wouldn't be used on another system (false only if you install
-        // on something like a USB stick anyway)
-        // → reduce size of initramfs aggressively for faster boot times
-        //
-        // on my system this reduces the size from 170M down to 43M.
-        // — mado
-        let dracut_cmd_status = Command::new("dracut")
-            .args([
-                "--force",
-                "--parallel",
-                "--regenerate-all",
-                "--hostonly",
-                "--strip",
-                "--aggressive-strip",
-            ])
-            .status()?;
+        stage!("Regenerating initramfs" {
+            // We assume the installation wouldn't be used on another system (false only if you install
+            // on something like a USB stick anyway)
+            // → reduce size of initramfs aggressively for faster boot times
+            //
+            // on my system this reduces the size from 170M down to 43M.
+            // — mado
+            let dracut_cmd_status = Command::new("dracut")
+                .args([
+                    "--force",
+                    "--parallel",
+                    "--regenerate-all",
+                    "--hostonly",
+                    "--strip",
+                    "--aggressive-strip",
+                ])
+                .status()?;
 
-        if !dracut_cmd_status.success() {
-            bail!(
-                "dracut failed with exit code {:?}",
-                dracut_cmd_status.code()
-            );
-        }
+            if !dracut_cmd_status.success() {
+                bail!(
+                    "dracut failed with exit code {:?}",
+                    dracut_cmd_status.code()
+                );
+            }
+        });
 
         Ok(())
     }

src/backend/postinstall/reinstall_kernel.rs

@@ -3,6 +3,8 @@ use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 use std::process::Command;
 
+use crate::stage;
+
 use super::{Context, PostInstallModule};
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
@@ -21,19 +23,21 @@ impl PostInstallModule for ReinstallKernel {
 
         // install kernel
 
-        let kernel_install_cmd_status = Command::new("kernel-install")
-            .arg("add")
-            .arg(kver)
-            .arg(format!("/lib/modules/{kver}/vmlinuz"))
-            .arg("--verbose")
-            .status()?;
-
-        if !kernel_install_cmd_status.success() {
-            bail!(
-                "kernel-install failed with exit code {:?}",
-                kernel_install_cmd_status.code()
-            );
-        }
+        stage!("Reinstalling kernels" {
+            let kernel_install_cmd_status = Command::new("kernel-install")
+                .arg("add")
+                .arg(kver)
+                .arg(format!("/lib/modules/{kver}/vmlinuz"))
+                .arg("--verbose")
+                .status()?;
+
+            if !kernel_install_cmd_status.success() {
+                bail!(
+                    "kernel-install failed with exit code {:?}",
+                    kernel_install_cmd_status.code()
+                );
+            }
+        });
 
         Ok(())
     }

src/backend/postinstall/selinux.rs

@@ -2,25 +2,29 @@ use color_eyre::{eyre::bail, Result};
 use serde::{Deserialize, Serialize};
 use std::process::Command;
 
+use crate::stage;
+
 use super::{Context, PostInstallModule};
 
 #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
 pub struct SELinux;
 
 impl PostInstallModule for SELinux {
     fn run(&self, _context: &Context) -> Result<()> {
-        let setfiles_cmd_status = Command::new("setfiles")
-            .args(["-e", "/proc", "-e", "/sys"])
-            .arg("/etc/selinux/targeted/contexts/files/file_contexts")
-            .arg("/")
-            .status()?;
+        stage!("Setting SELinux labels" {
+            let setfiles_cmd_status = Command::new("setfiles")
+                .args(["-e", "/proc", "-e", "/sys"])
+                .arg("/etc/selinux/targeted/contexts/files/file_contexts")
+                .arg("/")
+                .status()?;
 
-        if !setfiles_cmd_status.success() {
-            bail!(
-                "dracut failed with exit code {:?}",
-                setfiles_cmd_status.code()
-            );
-        }
+            if !setfiles_cmd_status.success() {
+                bail!(
+                    "dracut failed with exit code {:?}",
+                    setfiles_cmd_status.code()
+                );
+            }
+        });
 
         Ok(())
     }