mostly old uncommitted changes

committing everything without discretion

rebase -i from me

1 files changed, 24 insertions, 4 deletions

diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat
index 51f7cec..93c84d2 100644
--- a/initramfs-tools/scripts/samizdat
+++ b/initramfs-tools/scripts/samizdat
@@ -16,6 +16,28 @@ my_configure_networking()
     fi
 }
 
+read_nbd_variables()
+{
+    NBDCLIENT=:
+    . /scripts/local-top/nbd
+    unset NBDCLIENT
+}
+
+run_nbd_client()
+{
+    (debug_log samizdat.nbd
+     read_nbd_variables
+     for DEVNAME in /dev/nbd0 /dev/nbd1
+     do
+         case "$DEVNAME" in
+             /dev/nbd0) nbdpath=samizdat.btrfs ;;
+             /dev/nbd1) nbdpath=samizdat.patch.btrfs ;;
+         esac
+         nbd-client $nbdsrv -N $nbdpath $nbdport $DEVNAME -swap -persist -systemd-mark
+     done
+     bootdone nbd-script)
+}
+
 mountroot()
 {
   openvt -c 13 sh
@@ -24,10 +46,7 @@ mountroot()
 
   if [ "$nbdroot" ]; then
       my_configure_networking
-
-      (debug_log samizdat.nbd
-       . /scripts/local-top/nbd
-      bootdone nbd-script)
+      run_nbd_client
 
       wait_for_gnupghome_tar
       (sleep 5; echo ) &
@@ -56,6 +75,7 @@ wait_for_gnupghome_tar()
   done
   mv /gnupghome.tar.$$ /gnupghome.tar)
   echo '  done.' > /dev/tty1
+  bootdone gnupg-tar
 }
 
 samizdat_restart_udev()