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.

1 files changed, 16 insertions, 21 deletions

diff --git a/Makefile b/Makefile
index f7b88c7..c1dfb8a 100644
--- a/Makefile
+++ b/Makefile
@@ -91,7 +91,7 @@ SUDO_MAKE = sudo MAKEFLAGS="$$MAKEFLAGS" $(MAKE)
 
 .PHONY: install-configuration install-bootserver install-boot-server start-bootserver
 install-boot-server: install-bootserver
-install-bootserver: | rootfs/samizdat.btrfs
+install-bootserver: | $(rootfs)
         exit 1; sudo initrd.sh
         $(SUDO_MAKE) instdir=/ real-install-bootserver start-bootserver
 
@@ -138,30 +138,24 @@ update-submodules:
 install-submodules: cmd=install
 install-submodules: update-submodules $(INSTALL_SUBMODULES)
 
-GOLD =
-ifdef GOLD
-rootfs = samizdat-gold.seed.btrfs
-patchfs =
-else
-rootfs = samizdat.seed.btrfs
+rootfs = rootfs/_filesystem/samizdat.seed.btrfs
 patchfs = $(patsubst %.seed.btrfs,%.patch.btrfs,$(rootfs))
-endif
-rootfs_verity = $(addprefix rootfs/,$(addsuffix .verity,$(rootfs) $(patchfs)))
+rootfs_verity = $(addsuffix .verity,$(rootfs) $(patchfs))
 
 .PHONY: rootfs rootfs-deps
 rootfs-deps:
         [ -e install-submodules-stamp ] || make install-submodules-stamp
         [ -e install-stamp ] || $(SUDO_MAKE) install-stamp
 
-btrfs_images = $(addprefix rootfs/, $(rootfs) $(patchfs))
+btrfs_images = $(rootfs) $(patchfs)
 rootfs-clean:
         make -C rootfs clean all
 
 rootfs: rootfs-deps $(btrfs_images) $(rootfs_verity)
         sudo mkdir -p /srv/nbd
-        sudo ln -sf "$$PWD"/rootfs/$(rootfs) /srv/nbd/samizdat.btrfs
+        sudo ln -sf "$$PWD"/$(rootfs) /srv/nbd/samizdat.btrfs
 ifneq (,$(patchfs))
-        sudo ln -sf "$$PWD"/rootfs/$(patchfs) /srv/nbd/samizdat.patch.btrfs
+        sudo ln -sf "$$PWD"/$(patchfs) /srv/nbd/samizdat.patch.btrfs
 endif
 
 FORCE:
@@ -170,12 +164,12 @@ $(btrfs_images): FORCE
 
 boot: rootfs
         sudo ./src/mkinitramfs-samizdat
-        sudo ROOTFS=rootfs/$(rootfs) ./src/parted-usb.sh
+        sudo ROOTFS=$(rootfs) ./src/parted-usb.sh
 
 fastboot: rootfs
         sudo qemu.sh
 
-samizdat.netinst.iso: | rootfs/samizdat.btrfs
+samizdat.netinst.iso: | $(rootfs)
         exit 1; sudo initrd.sh
         sudo xorriso-usb.sh $(reuse_child) --bootloader --out $@
 
@@ -207,7 +201,7 @@ verity_root_hash = $(shell sed -ne 's/^Root hash:[ \t]*//p' $<)
 
 root_hash = $(shell sed -ne 's/^Root hash: *//p' < $<.log)
 
-veritymount: rootfs/samizdat.seed.btrfs.verity.log
+veritymount: $(rootfs).verity.log
         @sudo veritysetup remove samizverity >/dev/null 2>&1 || true
         sudo veritysetup create samizverity $(basename $(basename $<)) \
                               $(basename $<) \
@@ -227,8 +221,7 @@ apt = $(shell which apt || which apt-get)
 apt-get-update-stamp:
         @if $(stale); then set -x; sudo $(apt) update && touch $@; fi
 
-rootfs/seed.iso: $(addprefix rootfs/samizdat.seed.btrf, s \
-                  $(if $(VERITY), s.verity s.verity.log))
+rootfs/seed.iso: $(rootfs) $(if $(VERITY),$(addprefix $(rootfs),.verity .verity.log))
         rm -f $@~tmp
         touch $@~tmp
         fallocate -n -l 10G $@~tmp
@@ -287,9 +280,11 @@ upgrade-key: upgrade key
 
 .PHONY: usb key emu testinitrdkey testinitrd total-destroy persist
 
-persist: | partitions/persist.img
-partitions/persist.img:
-        make -C partitions $(notdir $@)
+PERSIST_FILE = partitions/_liveboot/persist.img
+
+persist: | $(PERSIST_FILE)
+$(PERSIST_FILE):
+        $(MAKE) -C partitions $(patsubst partitions/%,%,$@)
 
 usb emu efi: initrd rootfs
 key keymu emu-key: initrd
@@ -297,7 +292,7 @@ cleanmu: rootfs-clean total-destroy emu
 mu: up cleanmu
 
 usb emu key keymu emu-key total-destroy efi:
-        make -C partitions clean $@
+        $(MAKE) -C partitions clean $@
 
 testinitrdkey: keymu
 testinitrd: emu