Merge pull request #233 from Szubie/mount-ensure-removed

Allow for deletion of units with active mounts
bravetools · Dec 15, 2022 · 4e9c7fd · 4e9c7fd
2 parents 281cc22 + e73460c
commit 4e9c7fd
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/platform/host_api.go b/platform/host_api.go
@@ -626,9 +626,12 @@ func (bh *BraveHost) DeleteUnit(name string) error {
 		return err
 	}
 
-	for _, d := range inst.Devices {
-		if (d["type"] == "disk") && (d["path"] != "/") {
-			log.Fatal("unable to remove a unit with a mounted directory")
+	for deviceName, d := range inst.Devices {
+		if (d["type"] == "disk") && strings.HasPrefix(deviceName, "brave_") {
+			err = bh.UmountShare(name, d["path"])
+			if err != nil {
+				log.Printf("failed to unmount %q from multipass host: %s\n", path.Join("/home/ubuntu/volumes/", deviceName), err)
+			}
 		}
 	}