more samizdat-eject fixes

also, copy samizdat-eject from the initramfs to the new rootfs (into
/sbin)

5 files changed, 14 insertions, 12 deletions

diff --git a/initramfs-tools/hooks/samizdat b/initramfs-tools/hooks/samizdat
index ac71947..d9d5b5d 100755
--- a/initramfs-tools/hooks/samizdat
+++ b/initramfs-tools/hooks/samizdat
@@ -6,7 +6,7 @@ CopyExec() { copy_exec "$@" || exit 1; }
 
 . /usr/share/initramfs-tools/hook-functions
 
-repo_execs=$(echo ./old-school/* loop-layer.sh)
+repo_execs=$(echo ./old-school/* loop-layer.sh samizdat-eject.sh)
 
 path_execs='mountpoint openvt rsync gpg2 gpg-agent pinentry-curses truncate cryptsetup mkfs.btrfs btrfs fsck.hfsplus'
 
diff --git a/initrd-dependencies.txt b/initrd-dependencies.txt
index ffdfae5..cf73861 100644
--- a/initrd-dependencies.txt
+++ b/initrd-dependencies.txt
@@ -10,3 +10,5 @@ isolinux
 nbd-client
 cryptsetup
 hfsprogs
+grub-pc
+initramfs-tools
diff --git a/old-school/lvm-create.sh b/old-school/lvm-create.sh
index 916b888..d1ffc51 100644
--- a/old-school/lvm-create.sh
+++ b/old-school/lvm-create.sh
@@ -88,6 +88,8 @@ initialize_root_filesystem()
     btrfs subvolume create /root/root                   || return
     mv /gpg/gnupghome /root/root/.gnupg                 || return
 
+    rmdir /root/srv
+    btrfs subvolume create /root/srv
     rm -r /root/var/cache/apt/archives
     btrfs subvolume create /root/var/cache/apt/archives || return
 
@@ -95,7 +97,10 @@ initialize_root_filesystem()
     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/
+    # Copy these over unconditionally, because they ought to remain in sync with
+    # the initrd.
+    cp /bin/mdadm-dup.sh /root/sbin/
+    cp /bin/samizdat-eject.sh /root/sbin/
 
     sed -i -e 's/^root:x:/root::/' /root/etc/passwd
     cp /patchroot/* /root/root/
diff --git a/old-school/mdadm-dup.sh b/old-school/mdadm-dup.sh
index fe18e92..c13a325 100644
--- a/old-school/mdadm-dup.sh
+++ b/old-school/mdadm-dup.sh
@@ -38,7 +38,7 @@ dm_snapshot()
     persist=p
     chunksize=16
     dmsetup create "$new_dev_name" --table "0 $size snapshot $ro_dev $rw_dev $persist $chunksize" || return
-    wait_for_dm_device /dev/mapper/"$new_dev_name";
+    wait_for_dm_device /dev/mapper/"$new_dev_name"
     echo /dev/mapper/"$new_dev_name"
 }
 
@@ -54,7 +54,7 @@ dm_snapshot_teardown()
                 # errors ignored because the loop dev can be configured to be
                 # automatically removed upon disuse
                 losetup -d /dev/block/"$rw_dev" || true
-                eject /dev/block/"$ro_dev"      || exit 1
+                eject /dev/block/"$ro_dev"      || true
             ) || return
             ;;
         *) return 1 ;;
@@ -106,7 +106,7 @@ mdadm_dup()
 {
     local input_dev="$1" md_name="$2" sectors="$3"
 
-    mdadm --build $md_name ${sectors:+--size=$((sectors / 2))} \
+    mdadm --build "$md_name" "${sectors:+--size=$((sectors / 2))}" \
           --level=1 --raid-devices=1 --force --write-mostly "$input_dev" || return
 }
 
@@ -132,6 +132,7 @@ cryptsetup_temp()
     set $parms
 
     wait_for_dm_device /dev/mapper/"$cryptname"
+    rm "$temp_file"
     echo /dev/mapper/"$cryptname"
 }
 
@@ -140,7 +141,6 @@ mdadm_copy_eject_crypt()
     local md_dev="$1" temp_file="$2"
 
     [ -b "$md_dev" ]                                  || return
-    [ ! -e "$temp_file" ]                             || return
 
     local output_dev sectors
 
diff --git a/samizdat-eject.sh b/samizdat-eject.sh
index 0f4e117..bfd8e1c 100755
--- a/samizdat-eject.sh
+++ b/samizdat-eject.sh
@@ -44,13 +44,8 @@ done
 copy()
 {
     mdadm_copy_eject_crypt /dev/md55 "$temp_target" &&
-        dd if=/dev/md55 of="$target".part &&
+        mdadm_copy_eject /dev/md55 "$target".part &&
         mv "$target".part "$target"
-
-    # I suppose at this point $target should be made the backing device of
-    # /dev/md55
-
-    # Alternatively: mdadm --stop /dev/md55
 }
 
 remove()