From b47af54b9eafa809695ab4e2f9cc1c0cbde9707d Mon Sep 17 00:00:00 2001
From: Ron Williams <ron.williams@englishbluffcg.com>
Date: Mon, 3 Oct 2022 08:46:01 -0700
Subject: [PATCH] delete /tmp/redox_installer at every opportunity

---
 Makefile   | 2 ++
 mk/disk.mk | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/Makefile b/Makefile
index 4134c06..b746a24 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,7 @@ live: build/livedisk.iso
 
 rebuild:
 	-$(FUMOUNT) build/filesystem/ || true
+	-$(FUMOUNT) /tmp/redox_installer/ || true
 	rm -rf build
 	$(MAKE) all
 
@@ -20,6 +21,7 @@ clean:
 	cargo clean --manifest-path redoxfs/Cargo.toml
 	cargo clean --manifest-path relibc/Cargo.toml
 	-$(FUMOUNT) build/filesystem/ || true
+	-$(FUMOUNT) /tmp/redox_installer/ || true
 	rm -rf build
 
 distclean:
diff --git a/mk/disk.mk b/mk/disk.mk
index 6ec2eb7..7570120 100644
--- a/mk/disk.mk
+++ b/mk/disk.mk
@@ -1,6 +1,7 @@
 build/harddrive.img: $(REPO_TAG)
 	mkdir -p build
 	rm -rf $@  $@.partial
+	-$(FUMOUNT) /tmp/redox_installer || true
 	fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial
 	$(INSTALLER) -c $(FILESYSTEM_CONFIG) $@.partial
 	mv $@.partial $@
@@ -8,6 +9,7 @@ build/harddrive.img: $(REPO_TAG)
 build/livedisk.iso: $(REPO_TAG)
 	mkdir -p build
 	rm -rf $@  $@.partial
+	-$(FUMOUNT) /tmp/redox_installer || true
 	fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial
 	$(INSTALLER) -c $(FILESYSTEM_CONFIG) --live $@.partial
 	mv $@.partial $@
@@ -17,6 +19,7 @@ build/filesystem.img: $(REPO_TAG)
 	$(HOST_CARGO) build --manifest-path redoxfs/Cargo.toml --release
 	-$(FUMOUNT) build/filesystem/ || true
 	rm -rf $@  $@.partial build/filesystem/
+	-$(FUMOUNT) /tmp/redox_installer || true
 	fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial
 	redoxfs/target/release/redoxfs-mkfs $(REDOXFS_MKFS_FLAGS) $@.partial
 	mkdir -p build/filesystem/