diff options
author | Andrew Cady <d@jerkface.net> | 2017-03-26 06:26:47 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2017-03-26 06:56:30 -0400 |
commit | 217713edcd3a27d21577f8c4765f5b0d89981c7b (patch) | |
tree | b1a23d31ab4a0593a4767f6fe4915953a982ff16 /src/initrd/menu-select | |
parent | 3d2ce35290969eb98a3455b78d2bdecde44fa9d6 (diff) |
create and boot the encrypted root filesystem
Diffstat (limited to 'src/initrd/menu-select')
-rwxr-xr-x | src/initrd/menu-select | 12 |
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 | |||
83 | ;; | 83 | ;; |
84 | boot-destroy-disk) | 84 | boot-destroy-disk) |
85 | dev="$2" | 85 | dev="$2" |
86 | |||
86 | partition_new_hard_drive_DESTROYING_EVERYTHING "$dev" || error | 87 | partition_new_hard_drive_DESTROYING_EVERYTHING "$dev" || error |
87 | 88 | ||
89 | mkfs.btrfs -f "$dev"2 || error | ||
90 | mount "$dev"2 /gpg || error | ||
91 | init_gpg || error | ||
88 | 92 | ||
89 | # TODO: IMPLEMENT ME | 93 | init_samizdat_blockdev "$dev"3 /gpg/disk.key || error |
90 | # partition disk | 94 | init_samizdat /dev/mapper/samizdatcrypt '' || error |
91 | # init_samizdat | ||
92 | 95 | ||
93 | ;; | 96 | ;; |
94 | boot-overwrite|boot-new|boot-luks) | 97 | boot-overwrite|boot-new|boot-luks) |
@@ -115,7 +118,8 @@ case "$1" in | |||
115 | 118 | ||
116 | start_meter "Allocating ${megs}MB in '$loopfile' on $dev..." | 119 | start_meter "Allocating ${megs}MB in '$loopfile' on $dev..." |
117 | 120 | ||
118 | if init_samizdat_blockdev "$loopfile" "$megs" "$loopfile"k && | 121 | if newdev=$(init_samizdat_lodev "$loopfile" "$megs") && |
122 | init_samizdat_blockdev "$newdev" "$loopfile"k && | ||
119 | init_samizdat /dev/mapper/samizdatcrypt "$loopfile"; then | 123 | init_samizdat /dev/mapper/samizdatcrypt "$loopfile"; then |
120 | stop_meter done. | 124 | stop_meter done. |
121 | else | 125 | else |