1 files changed, 1 insertions, 9 deletions

diff --git a/src/initrd/menu-select b/src/initrd/menu-select
index 1fcade4..9730c09 100755
--- a/src/initrd/menu-select
+++ b/src/initrd/menu-select
@@ -5,7 +5,6 @@
 #  $0 boot-overwrite    [dev name] [loop file] [megabytes] - overwrite with new luks overlay
 #  $0 boot-luks         [dev name] [loop file]             - boot existing luks-encrypted overlay
 #  $0 boot-destroy-disk [dev-name]                         - install to a fresh hard disk
-#  $0 boot-gpg          [key id] [gnupg homedir] [???]     - boot any device signed with the key
 
 . btrfs-create.sh
 . common.sh
@@ -76,7 +75,6 @@ case "$1" in
     # specified in KB here. I did not really believe it.
     modprobe brd rd_nr=1 rd_size=$memtotal_kb
 
-    init_gpg || error
     init_samizdat /dev/ram0 '' || {
         umount /root/cdrom
         umount /root/outerfs
@@ -94,7 +92,6 @@ case "$1" in
     mkfs.btrfs -f "$dev"2                                 || error
     mkdir /plaintext
     mount "$dev"2 /plaintext                              || error
-    init_gpg                                              || error
 
     init_samizdat_blockdev "$dev"3 /plaintext/disk.key    || error
     init_samizdat /dev/mapper/samizdatcrypt ''            || error
@@ -106,10 +103,7 @@ case "$1" in
   boot-native)
     dev="$2"
     umount /plaintext || true
-    mkdir /plaintext
-    mount "$dev"2 /plaintext                           || error
-    init_gpg                                           || error
-    open_samizdat_blockdev "$dev"3 /plaintext/disk.key || error
+    open_samizdat_blockdev "$dev"3 - || error
     open_samizdat                                      || error open_samizdat
     bootdone root-mounted
   ;;
@@ -128,8 +122,6 @@ case "$1" in
       rm "$loopfile" "$loopfile"k
     fi
 
-    init_gpg || error
-
     if [ "$1" = 'boot-luks' ]; then
       open_samizdat_blockdev_from_loop "$loopfile" "$loopfile"k || error
       open_samizdat || error open_samizdat