Store large files in subvolumes

These files should never be mixed into the same directories as source
code, since source code should be backed up by filesystem snapshot, and
these should not.

This change includes file renames in this repository and in two of its
submodules.

5 files changed, 24 insertions, 17 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)
diff --git a/partitions/part5.conf b/partitions/part5.conf
index 08e4196..25d1fdb 100644
--- a/partitions/part5.conf
+++ b/partitions/part5.conf
@@ -1,3 +1,3 @@
 name=samizdat-root-seed
 type=dm-verity-data
-data_path=../rootfs/samizdat.seed.btrfs
+data_path=../rootfs/_filesystem/samizdat.seed.btrfs
diff --git a/partitions/part6.conf b/partitions/part6.conf
index 0075c91..d3f7515 100644
--- a/partitions/part6.conf
+++ b/partitions/part6.conf
@@ -1,3 +1,3 @@
 name=samizdat-root-seed-verity
 type=dm-verity-hashes
-data_path=../rootfs/samizdat.seed.btrfs
+data_path=../rootfs/_filesystem/samizdat.seed.btrfs
diff --git a/partitions/part7.conf b/partitions/part7.conf
index 7a77685..aaeee4e 100644
--- a/partitions/part7.conf
+++ b/partitions/part7.conf
@@ -1,3 +1,3 @@
 name=samizdat-rootfs
 type=dm-verity-data
-data_path=../rootfs/samizdat.patch.btrfs
+data_path=../rootfs/_filesystem/samizdat.patch.btrfs
diff --git a/partitions/part8.conf b/partitions/part8.conf
index 8298fd3..9dc22fe 100644
--- a/partitions/part8.conf
+++ b/partitions/part8.conf
@@ -1,3 +1,3 @@
 name=samizdat-root-patch-verity
 type=dm-verity-hashes
-data_path=../rootfs/samizdat.patch.btrfs
+data_path=../rootfs/_filesystem/samizdat.patch.btrfs