code cleanup

1 files changed, 2 insertions, 10 deletions

diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat
index ddcb64c..51f7cec 100644
--- a/initramfs-tools/scripts/samizdat
+++ b/initramfs-tools/scripts/samizdat
@@ -30,6 +30,8 @@ mountroot()
       bootdone nbd-script)
 
       wait_for_gnupghome_tar
+      (sleep 5; echo ) &
+      (. common.sh && . btrfs-create.sh && init_gpg)
   fi
 
   bootmenu
@@ -44,26 +46,16 @@ mountroot()
   chvt 1
 }
 
-cdrom_has_keys()
-{
-    [ ! "$BOOTIF" ] || return
-    bootwait samizdat-cdrom
-    [ -d /cdrom/gnupghome ]
-}
-
 wait_for_gnupghome_tar()
 {
   [ -e /gnupghome.tar ] && return
   echo -n Waiting to receive GPG keys through the network... > /dev/tty1
-  my_configure_networking
   (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
-  (sleep 5; echo ) &
-  (. common.sh && . btrfs-create.sh && init_gpg)
 }
 
 samizdat_restart_udev()