From f78b6498f69e04514cb84393e5daba669198c1c1 Mon Sep 17 00:00:00 2001 From: Wim de With Date: Fri, 12 Jan 2024 14:36:12 +0100 Subject: [PATCH] make-disk-image: optionally include ZFS module in kernel --- lib/make-disk-image.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/make-disk-image.nix b/lib/make-disk-image.nix index 6343664..01d70b4 100644 --- a/lib/make-disk-image.nix +++ b/lib/make-disk-image.nix @@ -10,7 +10,8 @@ let vmTools = pkgs.vmTools.override { rootModules = ["9p" "9pnet_virtio" "virtio_pci" "virtio_blk"] ++ nixosConfig.config.disko.extraRootModules; kernel = pkgs.aggregateModules - (with nixosConfig.config.boot.kernelPackages; [ kernel ]); + (with nixosConfig.config.boot.kernelPackages; [ kernel ] + ++ lib.optional (lib.elem "zfs" nixosConfig.config.disko.extraRootModules) zfs); }; cleanedConfig = diskoLib.testLib.prepareDiskoConfig nixosConfig.config diskoLib.testLib.devices; systemToInstall = nixosConfig.extendModules {