vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

delete /tmp/redox_installer at every opportunity

Browse source
This commit is contained in:
Ron Williams 2022-10-03 08:46:01 -07:00
parent abe04ecd79
commit b47af54b9e
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -10,6 +10,7 @@ live: build/livedisk.iso
rebuild: rebuild:
-$(FUMOUNT) build/filesystem/ || true -$(FUMOUNT) build/filesystem/ || true
-$(FUMOUNT) /tmp/redox_installer/ || true
rm -rf build rm -rf build
$(MAKE) all $(MAKE) all
@ -20,6 +21,7 @@ clean:
cargo clean --manifest-path redoxfs/Cargo.toml cargo clean --manifest-path redoxfs/Cargo.toml
cargo clean --manifest-path relibc/Cargo.toml cargo clean --manifest-path relibc/Cargo.toml
-$(FUMOUNT) build/filesystem/ || true -$(FUMOUNT) build/filesystem/ || true
-$(FUMOUNT) /tmp/redox_installer/ || true
rm -rf build rm -rf build
distclean: distclean:

3
mk/disk.mk
View file

@ -1,6 +1,7 @@
build/harddrive.img: $(REPO_TAG) build/harddrive.img: $(REPO_TAG)
mkdir -p build mkdir -p build
rm -rf $@ $@.partial rm -rf $@ $@.partial
-$(FUMOUNT) /tmp/redox_installer || true
fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial
$(INSTALLER) -c $(FILESYSTEM_CONFIG) $@.partial $(INSTALLER) -c $(FILESYSTEM_CONFIG) $@.partial
mv $@.partial $@ mv $@.partial $@
@ -8,6 +9,7 @@ build/harddrive.img: $(REPO_TAG)
build/livedisk.iso: $(REPO_TAG) build/livedisk.iso: $(REPO_TAG)
mkdir -p build mkdir -p build
rm -rf $@ $@.partial rm -rf $@ $@.partial
-$(FUMOUNT) /tmp/redox_installer || true
fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial
$(INSTALLER) -c $(FILESYSTEM_CONFIG) --live $@.partial $(INSTALLER) -c $(FILESYSTEM_CONFIG) --live $@.partial
mv $@.partial $@ mv $@.partial $@
@ -17,6 +19,7 @@ build/filesystem.img: $(REPO_TAG)
$(HOST_CARGO) build --manifest-path redoxfs/Cargo.toml --release $(HOST_CARGO) build --manifest-path redoxfs/Cargo.toml --release
-$(FUMOUNT) build/filesystem/ || true -$(FUMOUNT) build/filesystem/ || true
rm -rf $@ $@.partial build/filesystem/ rm -rf $@ $@.partial build/filesystem/
-$(FUMOUNT) /tmp/redox_installer || true
fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial fallocate --posix --length "$(FILESYSTEM_SIZE)MiB" $@.partial
redoxfs/target/release/redoxfs-mkfs $(REDOXFS_MKFS_FLAGS) $@.partial redoxfs/target/release/redoxfs-mkfs $(REDOXFS_MKFS_FLAGS) $@.partial
mkdir -p build/filesystem/ mkdir -p build/filesystem/