diff options
Diffstat (limited to 'src/initrd')
-rwxr-xr-x | src/initrd/menu-select | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/initrd/menu-select b/src/initrd/menu-select index 8347c28..c374b29 100755 --- a/src/initrd/menu-select +++ b/src/initrd/menu-select | |||
@@ -85,6 +85,7 @@ case "$1" in | |||
85 | boot-destroy-disk) | 85 | boot-destroy-disk) |
86 | dev="$2" | 86 | dev="$2" |
87 | 87 | ||
88 | umount /plaintext || true | ||
88 | partition_new_hard_drive_DESTROYING_EVERYTHING "$dev" || error | 89 | partition_new_hard_drive_DESTROYING_EVERYTHING "$dev" || error |
89 | 90 | ||
90 | mkfs.btrfs -f "$dev"2 || error | 91 | mkfs.btrfs -f "$dev"2 || error |
@@ -101,9 +102,10 @@ case "$1" in | |||
101 | ;; | 102 | ;; |
102 | boot-native) | 103 | boot-native) |
103 | dev="$2" | 104 | dev="$2" |
104 | init_gpg || error | 105 | umount /plaintext || true |
105 | mkdir /plaintext | 106 | mkdir /plaintext |
106 | mount "$dev"2 /plaintext || error | 107 | mount "$dev"2 /plaintext || error |
108 | init_gpg || error | ||
107 | open_samizdat_blockdev "$dev"3 /plaintext/disk.key || error | 109 | open_samizdat_blockdev "$dev"3 /plaintext/disk.key || error |
108 | open_samizdat || error | 110 | open_samizdat || error |
109 | bootdone root-mounted | 111 | bootdone root-mounted |