diff options
Diffstat (limited to 'src/initrd/menu-select')
-rwxr-xr-x | src/initrd/menu-select | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/initrd/menu-select b/src/initrd/menu-select index 4c921b0..8347c28 100755 --- a/src/initrd/menu-select +++ b/src/initrd/menu-select | |||
@@ -88,10 +88,11 @@ case "$1" in | |||
88 | partition_new_hard_drive_DESTROYING_EVERYTHING "$dev" || error | 88 | partition_new_hard_drive_DESTROYING_EVERYTHING "$dev" || error |
89 | 89 | ||
90 | mkfs.btrfs -f "$dev"2 || error | 90 | mkfs.btrfs -f "$dev"2 || error |
91 | mount "$dev"2 /gpg || error | 91 | mkdir /plaintext |
92 | mount "$dev"2 /plaintext || error | ||
92 | init_gpg || error | 93 | init_gpg || error |
93 | 94 | ||
94 | init_samizdat_blockdev "$dev"3 /gpg/disk.key || error | 95 | init_samizdat_blockdev "$dev"3 /plaintext/disk.key || error |
95 | init_samizdat /dev/mapper/samizdatcrypt '' || error | 96 | init_samizdat /dev/mapper/samizdatcrypt '' || error |
96 | 97 | ||
97 | mark_partitions_as_complete "$dev" | 98 | mark_partitions_as_complete "$dev" |
@@ -100,10 +101,11 @@ case "$1" in | |||
100 | ;; | 101 | ;; |
101 | boot-native) | 102 | boot-native) |
102 | dev="$2" | 103 | dev="$2" |
103 | init_gpg || error | 104 | init_gpg || error |
104 | mount "$dev"2 /gpg || error | 105 | mkdir /plaintext |
105 | open_samizdat_blockdev "$dev"3 /gpg/disk.key || error | 106 | mount "$dev"2 /plaintext || error |
106 | open_samizdat || error | 107 | open_samizdat_blockdev "$dev"3 /plaintext/disk.key || error |
108 | open_samizdat || error | ||
107 | bootdone root-mounted | 109 | bootdone root-mounted |
108 | ;; | 110 | ;; |
109 | boot-overwrite|boot-new|boot-luks) | 111 | boot-overwrite|boot-new|boot-luks) |