change script to first import storage before unlocking root

machines/fanny/configuration.nix

@@ -86,7 +86,6 @@ in
     enable = true;
     authorizedKeys = sshKeys.admins;
     ethernetDrivers = ["r8169"];
-    zfsExtraPools = [ "storage" ];
   };
 
   boot.initrd = {

machines/modules/malobeo/initssh.nix

@@ -22,11 +22,6 @@ in
       description = "Ethernet drivers to load: run `lspci -k | grep -iA4 ethernet`";
       example = "r8169";
     };
-    zfsExtraPools = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
-      default = [ ];
-      description = "Name or GUID of extra ZFS pools that you wish to import during boot.";
-    };
   };
   
   config = lib.mkIf (cfg.enable && config.malobeo.disks.encryption) {
@@ -37,12 +32,11 @@ in
       zfs = {
         forceImportAll = true;
         requestEncryptionCredentials = true;
-        extraPools = cfg.zfsExtraPools;
+        
       };
       initrd = {
         availableKernelModules = cfg.ethernetDrivers;
         systemd = {
-          initrdBin = [ pkgs.busybox pkgs.wireguard-tools pkgs.iproute2 ]; 
           enable = true;
           network.enable = true;
         };
@@ -62,7 +56,6 @@ in
           path = with pkgs; [ zfs ];
           serviceConfig.Type = "oneshot";
           script = ''
-            zpool import storage
             echo "zfs load-key -a; killall zfs; systemctl default" >> /var/empty/.profile
           '';
         };

scripts/unlock-boot.sh

@@ -24,14 +24,16 @@ diskkey=$(sops -d machines/$hostname/secrets/disk.key)
 echo
 if [ $# = 1 ]
     then
-    echo "$diskkey" | ssh $sshoptions root@$hostname-initrd "systemd-tty-ask-password-agent" #root
+    ssh $sshoptions root@$hostname-initrd "zpool import -a"
+    echo "$diskkey" | ssh $sshoptions root@$hostname-initrd "zfs load-key storage/encrypted" #root
     echo "$diskkey" | ssh $sshoptions root@$hostname-initrd "systemd-tty-ask-password-agent" #data
 
 elif [ $# = 2 ]
     then
     ip=$2
-    echo "$diskkey" | ssh $sshoptions root@$ip "systemd-tty-ask-password-agent" #root
+    ssh $sshoptions root@$ip "zpool import -a"
-    echo "$diskkey" | ssh $sshoptions root@$ip "systemd-tty-ask-password-agent" #data
+    echo "$diskkey" | ssh $sshoptions root@$ip "zfs load-key storage/encrypted" 
+    echo "$diskkey" | ssh $sshoptions root@$ip "systemd-tty-ask-password-agent"
     
 else
     echo