2 files changed, 13 insertions, 7 deletions

diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat
index ea31c9f..1591883 100644
--- a/initramfs-tools/scripts/samizdat
+++ b/initramfs-tools/scripts/samizdat
@@ -6,8 +6,12 @@ mountroot()
 
   samizdat_install_udev_rules
   mkfifo "$MENUFIFO"
-  sh /scripts/local-top/nbd & # I guess this isn't getting called otherwise?
-  wait_for_gnupghome_tar
+  sh /scripts/local-top/nbd >/dev/null 2>&1 & # I guess this isn't getting called otherwise?
+
+  if [ "${nbdroot%%,*}" ]; then
+    wait_for_gnupghome_tar
+  fi
+
   bootmenu
   bootwait root-mounted
   chvt 1
@@ -16,7 +20,6 @@ mountroot()
 wait_for_gnupghome_tar()
 {
   [ -e /gnupghome.tar ] && return
-  [ "${nbdroot%%,*}" ] || return
   echo -n Waiting to receive GPG keys through the network...
   (while ! tftp -g -r gnupghome.tar -l /gnupghome.tar.$$ ${nbdroot%%,*} 2>/dev/null; do
     sleep 1;
@@ -24,6 +27,7 @@ wait_for_gnupghome_tar()
   done
   mv /gnupghome.tar.$$ /gnupghome.tar)
   echo '  done.'
+  (. common.sh && . btrfs-create.sh && init_gpg)
 }
 
 samizdat_install_udev_rules()
diff --git a/src/initrd/grok-block b/src/initrd/grok-block
index e573c91..93770d5 100755
--- a/src/initrd/grok-block
+++ b/src/initrd/grok-block
@@ -135,10 +135,12 @@ grok_block()
     if [ "$freemegs" -ge 300 ]; then
 
       umount=false
-      bootwait samizdat-cdrom
-      cdromblocks=$(stat -f -c %b /cdrom)
-      cdromblocksize=$(stat -f -c %S /cdrom)
-      cdrommegs=$((cdromblocks * cdromblocksize / 1024 / 1024))
+      # bootwait samizdat-cdrom
+      # cdromblocks=$(stat -f -c %b /cdrom)
+      # cdromblocksize=$(stat -f -c %S /cdrom)
+      # cdrommegs=$((cdromblocks * cdromblocksize / 1024 / 1024))
+
+      cdrommegs=700 # TODO: go back to checking the size
 
       if [ "$freemegs"   -ge "$((cdrommegs * 3))" ]; then
         addmenu_makeroot "$DEVNAME" "${mountpoint}/samizdat.$N" "$((cdrommegs * 3))" 1