diff --git a/machines/fanny/configuration.nix b/machines/fanny/configuration.nix index 29a7490..9cf84ff 100644 --- a/machines/fanny/configuration.nix +++ b/machines/fanny/configuration.nix @@ -86,6 +86,7 @@ in enable = true; authorizedKeys = sshKeys.admins; ethernetDrivers = ["r8169"]; + zfsExtraPools = [ "storage" ]; }; boot.initrd = { diff --git a/machines/modules/malobeo/initssh.nix b/machines/modules/malobeo/initssh.nix index 62d2ceb..ff77d40 100644 --- a/machines/modules/malobeo/initssh.nix +++ b/machines/modules/malobeo/initssh.nix @@ -22,6 +22,11 @@ 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) { @@ -32,7 +37,7 @@ in zfs = { forceImportAll = true; requestEncryptionCredentials = true; - + extraPools = cfg.zfsExtraPools; }; initrd = { availableKernelModules = cfg.ethernetDrivers;