more samizdat-eject fixes

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

1 files changed, 6 insertions, 1 deletions

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/