From 2586f841b8ff0861852f4f858a547f427a8acc67 Mon Sep 17 00:00:00 2001
From: Aiden McClelland <me@drbonez.dev>
Date: Mon, 9 Mar 2026 23:59:38 -0600
Subject: [PATCH] fix: make unmount idempotent by ignoring "not mounted" errors

---
 core/src/disk/mount/util.rs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/src/disk/mount/util.rs b/core/src/disk/mount/util.rs
index 327bb2169..30b6a5435 100644
--- a/core/src/disk/mount/util.rs
+++ b/core/src/disk/mount/util.rs
@@ -52,13 +52,19 @@ pub async fn bind<P0: AsRef<Path>, P1: AsRef<Path>>(
 pub async fn unmount<P: AsRef<Path>>(mountpoint: P, lazy: bool) -> Result<(), Error> {
     tracing::debug!("Unmounting {}.", mountpoint.as_ref().display());
     let mut cmd = tokio::process::Command::new("umount");
+    cmd.env("LANG", "C.UTF-8");
     if lazy {
         cmd.arg("-l");
     }
-    cmd.arg(mountpoint.as_ref())
+    match cmd
+        .arg(mountpoint.as_ref())
         .invoke(crate::ErrorKind::Filesystem)
-        .await?;
-    Ok(())
+        .await
+    {
+        Ok(_) => Ok(()),
+        Err(e) if e.to_string().contains("not mounted") => Ok(()),
+        Err(e) => Err(e),
+    }
 }
 
 /// Unmounts all mountpoints under (and including) the given path, in reverse