create and boot the encrypted root filesystem

1 files changed, 8 insertions, 4 deletions

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