efi: unmount only if bootupd did the mount

Assisted-by: Claude Code (Claude Sonnet 4)

Author: HuijingHei

src/efi.rs

@@ -68,6 +68,8 @@ pub(crate) fn is_efi_booted() -> Result<bool> {
 #[derive(Default)]
 pub(crate) struct Efi {
     mountpoint: RefCell<Option<PathBuf>>,
+    /// Track whether we mounted the ESP ourselves (true) or found it pre-mounted (false)
+    did_mount: RefCell<bool>,
 }
 
 impl Efi {
@@ -93,6 +95,7 @@ impl Efi {
         if let Some(mnt) = found_mount {
             log::debug!("Reusing existing mount point {mnt:?}");
             *self.mountpoint.borrow_mut() = Some(mnt.clone());
+            *self.did_mount.borrow_mut() = false; // We didn't mount it
             Ok(Some(mnt))
         } else {
             Ok(None)
@@ -111,14 +114,15 @@ impl Efi {
             std::process::Command::new("mount")
                 .arg(&esp_device)
                 .arg(&mnt)
-                .run()
+                .run_inherited()
                 .with_context(|| format!("Failed to mount {:?}", esp_device))?;
             log::debug!("Mounted at {mnt:?}");
             mountpoint = Some(mnt);
             break;
         }
         let mnt = mountpoint.ok_or_else(|| anyhow::anyhow!("No mount point found"))?;
         *self.mountpoint.borrow_mut() = Some(mnt.clone());
+        *self.did_mount.borrow_mut() = true; // We mounted it ourselves
         Ok(mnt)
     }
 
@@ -136,12 +140,16 @@ impl Efi {
     }
 
     fn unmount(&self) -> Result<()> {
-        if let Some(mount) = self.mountpoint.borrow_mut().take() {
-            Command::new("umount")
-                .arg(&mount)
-                .run()
-                .with_context(|| format!("Failed to unmount {mount:?}"))?;
-            log::trace!("Unmounted");
+        // Only unmount if we mounted it ourselves
+        if *self.did_mount.borrow() {
+            if let Some(mount) = self.mountpoint.borrow_mut().take() {
+                Command::new("umount")
+                    .arg(&mount)
+                    .run_inherited()
+                    .with_context(|| format!("Failed to unmount {mount:?}"))?;
+                log::trace!("Unmounted");
+                *self.did_mount.borrow_mut() = false;
+            }
         }
         Ok(())
     }
@@ -775,7 +783,7 @@ pub(crate) fn clear_efi_target(target: &str) -> Result<()> {
             let mut cmd = Command::new(EFIBOOTMGR);
             cmd.args(["-b", entry.id.as_str(), "-B"]);
             println!("Executing: {cmd:?}");
-            cmd.run_with_cmd_context()?;
+            cmd.run_inherited_with_cmd_context()?;
         }
     }
 
@@ -803,7 +811,7 @@ pub(crate) fn create_efi_boot_entry(
         target,
     ]);
     println!("Executing: {cmd:?}");
-    cmd.run_with_cmd_context()
+    cmd.run_inherited_with_cmd_context()
 }
 
 #[context("Find target file recursively")]