1 files changed, 14 insertions, 5 deletions

diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat
index 515b724..a42b321 100644
--- a/initramfs-tools/scripts/samizdat
+++ b/initramfs-tools/scripts/samizdat
@@ -8,20 +8,29 @@ mountroot()
   samizdat_install_udev_rules
 
   if [ "${nbdroot%%,*}" ]; then
-    # I guess this isn't getting called otherwise? I don't know why this should
-    # be necessary, but it is.
-    sh /scripts/local-top/nbd >/dev/null 2>&1
+      (. common.sh
+       sh /scripts/local-top/nbd >/dev/null 2>&1;
+       bootdone nbd-script) &
   fi
 
-  if keys_via_network; then
-    wait_for_gnupghome_tar "$tftp_key_server"
+  if ! cdrom_has_keys && keys_via_network; then
+      bootwait nbd-script
+      wait_for_gnupghome_tar "$tftp_key_server"
   fi
+
   bootwait samizdat-gpg
   bootmenu
   bootwait root-mounted
   chvt 1
 }
 
+cdrom_has_keys()
+{
+    [ ! "$BOOTIF" ] || return
+    bootwait samizdat-cdrom
+    [ -d /cdrom/gnupghome ]
+}
+
 # Sets $tftp_key_server or returns false.
 keys_via_network()
 {