4 files changed, 69 insertions, 5 deletions

diff --git a/initrd-dependencies.txt b/initrd-dependencies.txt
index 6f4f9e6..9265bcb 100644
--- a/initrd-dependencies.txt
+++ b/initrd-dependencies.txt
@@ -3,3 +3,6 @@ pgpdump
 monkeysphere
 libmime-base32-perl
 pinentry-curses
+mdadm
+ntfs-3g
+hfsplus
diff --git a/old-school/lvm-create.sh b/old-school/lvm-create.sh
index ecbae49..b6d38d2 100644
--- a/old-school/lvm-create.sh
+++ b/old-school/lvm-create.sh
@@ -1,6 +1,4 @@
 #!/bin/sh
-: ${ROOT_MKFS_CMD:=mkfs.ext4 -q}
-: ${ROOT_FS_TYPE:=ext4}
 
 losetup() { /sbin/losetup "$@"; }
 
@@ -55,12 +53,28 @@ init_samizdat()
 
   btrfs device add "$blockdev" /root || return
   mount -o rw,remount /root || return
-  btrfs subvolume create /root/gpg || return
-  mv /gpg/gnupghome /root/gpg/ || return
+
+  initialize_root_filesystem || return
 
   bootdone root-mounted
 }
 
+initialize_root_filesystem()
+{
+    btrfs subvolume create /root/gpg                    || return
+    mv /gpg/gnupghome /root/gpg/                        || return
+
+    rm -r /root/var/cache/apt/archives
+    btrfs subvolume create /root/var/cache/apt/archives || return
+
+    rmdir /root/home
+    btrfs subvolume create /root/home                   || return
+
+    [ -x /root/sbin/mdadm ] || cp /sbin/mdadm /root/sbin/
+    [ -e /root/sbin/mdadm-dup.sh ] || cp /bin/mdadm-dup.sh /root/sbin/
+    true
+}
+
 # Get the uuid of the filesystem with the most devices,
 # excluding filesystems that don't incorporate loop devices.
 # This is used to choose the latest seed -- which should have
diff --git a/patchroot.sh b/patchroot.sh
index e211377..3efa8ec 100755
--- a/patchroot.sh
+++ b/patchroot.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-pkgs='avahi-daemon git tmux btrfs-tools/jessie-backports sshfs'
+pkgs='avahi-daemon git tmux btrfs-tools/jessie-backports sshfs eject'
 pkgs="$pkgs $(cat initrd-dependencies.txt)"
 pkgs="$pkgs linux-image-$(uname -r)"
 
diff --git a/samizdat-eject.sh b/samizdat-eject.sh
new file mode 100755
index 0000000..04ee610
--- /dev/null
+++ b/samizdat-eject.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+. mdadm-dup.sh || exit 1
+
+btrfs_subdevices()
+{
+    local mountpoint="$1"
+    btrfs filesystem show "$mountpoint" | sed -ne 's/^[ \t]*devid.* path //p'
+}
+
+devices=$(btrfs_subdevices /) || exit 1
+
+set --
+seen=
+for dev in $devices; do
+    [ -b "$dev" ] || exit 1
+    case "$dev" in
+        /dev/mapper/loop*) set -- "$@" "$dev" ;;
+        /dev/mapper/samizdatcrypt) seen=y ;;
+    esac
+done
+[ "$seen" ] || exit 1
+
+copy()
+{
+    mdadm_copy_eject /dev/md55 /root/samizdat.iso
+}
+
+remove()
+{
+    for dev; do
+        (set -x; btrfs device remove "$dev" /)
+    done
+}
+
+# Doing the mdadm copy before removing the devices means our filesystem includes
+# devices that are ultimately backed by files ON THE SAME FILESYSTEM. As such, it
+# might conceivably put btrfs into a deadlock of some kind.
+
+# If it turns out this doesn't work, the order can be reversed. This will
+# perform the read IO twice, though, almost doubling the total installation
+# time.
+
+copy & remove "$@"
+
+set -x
+wait