From 69dc41a1d8c7f6e2676938427276fdea2611b18f Mon Sep 17 00:00:00 2001 From: Wildan M Date: Fri, 8 May 2026 19:30:35 +0700 Subject: [PATCH] Prevent running QEMU if disk mounted --- mk/disk.mk | 8 ++++++-- mk/qemu.mk | 6 ++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/mk/disk.mk b/mk/disk.mk index 9f64a178..dd5ae1f2 100644 --- a/mk/disk.mk +++ b/mk/disk.mk @@ -94,8 +94,12 @@ ifeq ($(FSTOOLS_IN_PODMAN),1) $(PODMAN_RUN) make $@ else @sync - -$(FUMOUNT) $(MOUNT_DIR) +ifneq ($(wildcard $(MOUNT_DIR)),) + $(FUMOUNT) $(MOUNT_DIR) @rm -rf $(MOUNT_DIR) - @-$(FUMOUNT) /tmp/redox_installer 2>/dev/null || true @echo "\033[1;36;49mFilesystem unmounted\033[0m" +else + @echo "\033[1;36;49mDisk is not mounted\033[0m" +endif + @-$(FUMOUNT) /tmp/redox_installer 2>/dev/null || true endif diff --git a/mk/qemu.mk b/mk/qemu.mk index 161c7966..e2e2d819 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -375,4 +375,10 @@ $(BUILD)/qemu_uboot.rom: wget -O $@ https://gitlab.redox-os.org/Ivan/redox_firmware/-/raw/main/platform/qemu/qemu_arm64/u-boot-qemu-arm64.bin qemu: qemu-deps +ifeq ($(wildcard $(MOUNT_DIR)),) $(QEMU) $(QEMUFLAGS) +else + @echo "\033[1;38;5;196mDisk is mounted. Unmounting the disk...\033[0m"; + $(MAKE) unmount + $(QEMU) $(QEMUFLAGS) +endif