use mountpoint /plaintext for samizdat-plaintext partition

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
     partition_new_hard_drive_DESTROYING_EVERYTHING "$dev" || error
 
     mkfs.btrfs -f "$dev"2                                 || error
-    mount "$dev"2 /gpg                                    || error
+    mkdir /plaintext
+    mount "$dev"2 /plaintext                              || error
     init_gpg                                              || error
 
-    init_samizdat_blockdev "$dev"3 /gpg/disk.key          || error
+    init_samizdat_blockdev "$dev"3 /plaintext/disk.key    || error
     init_samizdat /dev/mapper/samizdatcrypt ''            || error
 
     mark_partitions_as_complete "$dev"
@@ -100,10 +101,11 @@ case "$1" in
   ;;
   boot-native)
     dev="$2"
-    init_gpg                                     || error
-    mount "$dev"2 /gpg                           || error
-    open_samizdat_blockdev "$dev"3 /gpg/disk.key || error
-    open_samizdat                                || error
+    init_gpg                                           || error
+    mkdir /plaintext
+    mount "$dev"2 /plaintext                           || error
+    open_samizdat_blockdev "$dev"3 /plaintext/disk.key || error
+    open_samizdat                                      || error
     bootdone root-mounted
   ;;
   boot-overwrite|boot-new|boot-luks)