create and boot the encrypted root filesystem

3 files changed, 32 insertions, 22 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
diff --git a/src/initrd/grok-block b/src/initrd/grok-block
index 086722d..01265b0 100755
--- a/src/initrd/grok-block
+++ b/src/initrd/grok-block
@@ -7,7 +7,7 @@ case "$DEVNAME" in /dev/loop*|/dev/ram*|/dev/dm-*|/dev/md*|/dev/fd*) exit ;; esa
 
 debug_log "grok-block.${DEVNAME##*/}"
 
-addmenu_choosekey() 
+addmenu_choosekey()
 {
   dev=$1
   dir=$2
@@ -62,8 +62,8 @@ retry_mount()
   until mntout="$(mount "$@" 2>&1)"
   do
     tries=$(( tries - 1 ))
-    case "$mntout" in 
-      *"Device or resource busy"*) 
+    case "$mntout" in
+      *"Device or resource busy"*)
         if [ $tries -le 0 ]; then
           warn "mount $@ failed: $mntout"
           return 1
@@ -103,8 +103,9 @@ is_device_without_partitions()
 
 is_incomplete_samizdat_install()
 {
+    # TODO: Possibly only some of the partitions are incomplete
     local partition_names="$(parted -sm "$1" print | sed 1,2d | awk -F: -e '{printf "%s:", $6}')"
-    [ "$partition_names" = 'primary:gpg-incomplete:luks-incomplete:' ]
+    [ "$partition_names" = 'samizdat-grub-incomplete:samizdat-plaintext-incomplete:samizdat-luks-encrypted-incomplete:' ]
 }
 
 grok_block()
@@ -119,6 +120,12 @@ grok_block()
     *)    mount_type="-t $ID_FS_TYPE" ;;
   esac
 
+  # Skip partitions that we created.
+  # TODO: make these names more unique
+  case "$ID_PART_ENTRY_NAME" in
+      samizdat-grub-incomplete|samizdat-plaintext-incomplete|samizdat-luks-encrypted-incomplete) return ;;
+  esac
+
   if [ "$ID_FS_TYPE" = hfsplus ] && ! fsck.hfsplus -q "$DEVNAME"; then
     (if fsck.hfsplus "$DEVNAME"; then
       grok-block "$DEVNAME"
@@ -200,7 +207,7 @@ grok_block()
 }
 
 # Get me all them nice udev variables
-eval "$(PATH=$PATH:/lib/udev vol_id "$DEVNAME" | 
+eval "$(PATH=$PATH:/lib/udev vol_id "$DEVNAME" |
   sed "s/'/'\\\\''/; s/=\(.*\)/='\1'/"
 )"
 
@@ -209,7 +216,7 @@ CDROM_ID_FS_LABEL_ENC=$(sed 's/ /\\x20/g' /lib/samizdat/vol_id.txt)
 if [ "$ID_FS_UUID_ENC"  = "$CDROM_ID_FS_UUID_ENC" -o \
      "$ID_FS_LABEL_ENC" = "$CDROM_ID_FS_LABEL_ENC" ]
 then
-  # Recognize and mount the Samizdat 
+  # Recognize and mount the Samizdat
   if ! mountpoint -q /cdrom; then
     mkdir -p /cdrom
     . mdadm-dup.sh
diff --git a/src/initrd/menu-select b/src/initrd/menu-select
index 4908b03..4a141a4 100755
--- a/src/initrd/menu-select
+++ b/src/initrd/menu-select
@@ -83,12 +83,15 @@ case "$1" in
   ;;
   boot-destroy-disk)
     dev="$2"
+
     partition_new_hard_drive_DESTROYING_EVERYTHING "$dev" || error
 
+    mkfs.btrfs -f "$dev"2                                 || error
+    mount "$dev"2 /gpg                                    || error
+    init_gpg                                              || error
 
-    # TODO: IMPLEMENT ME
-    # partition disk
-    # init_samizdat
+    init_samizdat_blockdev "$dev"3 /gpg/disk.key          || error
+    init_samizdat /dev/mapper/samizdatcrypt ''            || error
 
   ;;
   boot-overwrite|boot-new|boot-luks)
@@ -115,7 +118,8 @@ case "$1" in
 
     start_meter "Allocating ${megs}MB in '$loopfile' on $dev..."
 
-    if init_samizdat_blockdev "$loopfile" "$megs" "$loopfile"k &&
+    if newdev=$(init_samizdat_lodev "$loopfile" "$megs") &&
+        init_samizdat_blockdev "$newdev" "$loopfile"k &&
             init_samizdat /dev/mapper/samizdatcrypt "$loopfile"; then
       stop_meter done.
     else