remove gpg

1 files changed, 1 insertions, 18 deletions

diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat
index 8e9d4fa..9d8b846 100644
--- a/initramfs-tools/scripts/samizdat
+++ b/initramfs-tools/scripts/samizdat
@@ -62,15 +62,11 @@ mountroot()
   if [ "$nbdroot" ]; then
       my_configure_networking
       run_nbd_client
-
-      wait_for_gnupghome_tar
-      (sleep 5; echo ) &
-      (. common.sh && . btrfs-create.sh && init_gpg)
+      (. common.sh && . btrfs-create.sh)
   fi
 
   bootmenu
   samizdat_install_udev_rules
-  bootwait samizdat-gpg
   bootwait root-mounted
   osname=$(get_os_name)
   write_resolv_dot_conf
@@ -87,19 +83,6 @@ Press alt-f9 for rescue terminal.
 EOF
 }
 
-wait_for_gnupghome_tar()
-{
-  [ -e /gnupghome.tar ] && return
-  echo -n Waiting to receive GPG keys through the network... > /dev/tty1
-  (while ! tftp -g -r gnupghome.tar -l /gnupghome.tar.$$ "$ROOTSERVER" 2>/run/initramfs/samizdat/log/tftp.$$.log; do
-    sleep 1;
-    echo -n . > /dev/tty1
-  done
-  mv /gnupghome.tar.$$ /gnupghome.tar)
-  echo '  done.' > /dev/tty1
-  bootdone gnupg-tar
-}
-
 samizdat_restart_udev()
 {
   local LOG_DIR=/run/initramfs/samizdat/log