1 files changed, 20 insertions, 13 deletions

diff --git a/partitions/Makefile b/partitions/Makefile
index 1007a5c..91a60d9 100644
--- a/partitions/Makefile
+++ b/partitions/Makefile
@@ -1,29 +1,36 @@
 
 .PHONY: all clean
 
-all: whole.img
+whole = _build/whole.img
+key = _build/key.img
+
+all: $(whole)
 
 stage0_efi_file = ../import-grub-bootx64-efi/3/BOOTX64.EFI
 $(stage0_efi_file):
         make -C ../import-grub-bootx64-efi ver=3
 
-whole.img: $(stage0_efi_file)
+$(whole): $(stage0_efi_file)
         partvi
 
-key.img: $(stage0_efi_file)
+$(key): $(stage0_efi_file)
         partvi key
 
+_liveboot:
+        btrfs subvolume create $@
+
 PERSIST_SIZE=20G
-persist.img:
+PERSIST_FILE=_liveboot/persist.img
+$(PERSIST_FILE): | _liveboot
         [ ! -e $@ ]
         fallocate -l "$(PERSIST_SIZE)" $@
         truncate -s 0 $@
         truncate -s "$(PERSIST_SIZE)" $@
 
-persist := $(shell [ -e persist.img ] && printf %s '-drive file=persist.img,media=disk,driver=raw' || true)
+optional_persist_disk != [ ! -e $(PERSIST_FILE) ] || printf %s '-drive file=$(PERSIST_FILE),media=disk,driver=raw'
 
 .PHONY: usb emu key emu-key keymu
-usb: whole.img
+usb: $(whole)
         usb=$$(usb) && sudo dd status=progress if="$<" of="$$usb"
 
 # QEMU_DISPLAY_OPTIONS = -nographic
@@ -34,16 +41,16 @@ QEMU_OPTIONS = $(QEMU_BIOS_OPTIONS) $(QEMU_DISPLAY_OPTIONS)
 define emu
         NO_AT_BRIDGE=1 qemu-system-x86_64 ${QEMU_OPTIONS} -m 800 -enable-kvm -boot c \
           -drive file=$(1),media=disk,driver=raw \
-          $(persist)
+          $(optional_persist_disk)
 endef
 
-emu: whole.img
+emu: $(whole)
         $(call emu,$<)
 
-emu-key keymu: key.img
+emu-key keymu: $(key)
         $(call emu,$<)
 
-key: key.img
+key: $(key)
         usb=$$(usb) && \
                 sudo dd status=progress bs=1048576 if="$<" of="$$usb" && \
                 sudo $(call emu,"$$usb")
@@ -56,9 +63,9 @@ efi-ventoy: ventoy-efi-example.img
         $(call emu,$<)
 
 clean:
-        rm -rf _build whole.img key.img
+        rm -rf _build
 
 .PHONY: total-destroy
 total-destroy: clean
-        rm -f persist.img
-        $(MAKE) persist.img
+        rm -f $(PERSIST_FILE)
+        $(MAKE) $(PERSIST_FILE)