From f6d65aee63d1fdcf83666686c7c6aae0b491c734 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Sat, 5 Oct 2019 10:01:44 -0600 Subject: [PATCH] Add target to mount extra and use livedisk with nvme --- mk/filesystem.mk | 7 +++++++ mk/qemu.mk | 10 ++++++++++ 2 files changed, 17 insertions(+) diff --git a/mk/filesystem.mk b/mk/filesystem.mk index 2764048..37c978b 100644 --- a/mk/filesystem.mk +++ b/mk/filesystem.mk @@ -27,6 +27,13 @@ mount: FORCE sleep 2 pgrep redoxfs +mount_extra: FORCE + mkdir -p build/filesystem/ + cargo build --manifest-path redoxfs/Cargo.toml --release --bin redoxfs + cargo run --manifest-path redoxfs/Cargo.toml --release --bin redoxfs -- build/extra.bin build/filesystem/ + sleep 2 + pgrep redoxfs + unmount: FORCE sync -$(FUMOUNT) build/filesystem/ || true diff --git a/mk/qemu.mk b/mk/qemu.mk index 35595fd..af835e3 100644 --- a/mk/qemu.mk +++ b/mk/qemu.mk @@ -91,6 +91,16 @@ qemu_nvme_efi_no_build: build/extra.bin -drive file=build/harddrive-efi.bin,format=raw,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL \ -drive file=build/extra.bin,format=raw,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA +qemu_nvme_live: build/livedisk.bin build/extra.bin + $(QEMU) $(QEMUFLAGS) \ + -drive file=build/livedisk.bin,format=raw,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL \ + -drive file=build/extra.bin,format=raw,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA + +qemu_nvme_live_no_build: build/extra.bin + $(QEMU) $(QEMUFLAGS) \ + -drive file=build/livedisk.bin,format=raw,if=none,id=drv0 -device nvme,drive=drv0,serial=NVME_SERIAL \ + -drive file=build/extra.bin,format=raw,if=none,id=drv1 -device nvme,drive=drv1,serial=NVME_EXTRA + qemu_live: build/livedisk.bin build/extra.bin $(QEMU) $(QEMUFLAGS) \ -drive file=build/livedisk.bin,format=raw \