create and boot the encrypted root filesystem

1 files changed, 11 insertions, 12 deletions

diff --git a/src/initrd/btrfs-create.sh b/src/initrd/btrfs-create.sh
index 5d359a9..b5cc2c5 100644
--- a/src/initrd/btrfs-create.sh
+++ b/src/initrd/btrfs-create.sh
@@ -80,6 +80,7 @@ samizdat_movemounts()
     mount -o move /cdrom /root/cdrom
     mkdir -p /run/initramfs/samizdat/log
     cp /var/log/* /run/initramfs/samizdat/log
+    umount /gpg
     true
 }
 
@@ -172,15 +173,15 @@ partition_new_hard_drive_DESTROYING_EVERYTHING()
 {
     local target="$1"
     # [ "$(parted -sm "$target" print | grep -c :)"  = 1 ] || return
-    parted "$target" -sm                  \
-           unit B                         \
-           mklabel gpt                    \
-           mkpart primary 32KiB 4MiB      \
-           set 1 bios_grub on             \
-           mkpart primary btrfs 4MiB 1GiB \
-           name 2 gpg-incomplete          \
-           mkpart primary 1GiB 100%       \
-           name 3 luks-incomplete
+    parted "$target" -sm                                        \
+           unit B                                               \
+           mklabel gpt                                          \
+           mkpart samizdat-grub-incomplete 32KiB 4MiB           \
+           set 1 bios_grub on                                   \
+           mkpart samizdat-plaintext-incomplete btrfs 4MiB 1GiB \
+           mkpart samizdat-luks-encrypted-incomplete 1GiB 100%  \
+        &&
+        udevadm settle
 }
 
 open_samizdat()
@@ -227,11 +228,9 @@ open_samizdat_blockdev()
 
 init_samizdat_blockdev()
 {
-  local imgfile="$1" megs="$2" keyfile="$3" dev
+  local dev="$1" keyfile="$2"
   local cryptname=samizdatcrypt
 
-  dev=$(init_samizdat_lodev "$imgfile" "$megs") || return
-
   [ ! -b /dev/mapper/"$cryptname" ] || return
 
   luks_secret >/dev/null