From d16aa077d285c3df886116f472e11a8f330be33d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 2 Feb 2025 20:12:49 +0100
Subject: [PATCH] nixos/lib/make-*-disk-zfs-image: fix build

Those two helpers have not received the memo about a new requirement for
virtiofs and about changes regarding the zfs related attributes.

Can be tested with nix/release.nix' amazonImageZfs.
---
 nixos/lib/make-multi-disk-zfs-image.nix  | 11 ++++++-----
 nixos/lib/make-single-disk-zfs-image.nix | 11 ++++++-----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/nixos/lib/make-multi-disk-zfs-image.nix b/nixos/lib/make-multi-disk-zfs-image.nix
index c4d6d69fae14..62937d50139c 100644
--- a/nixos/lib/make-multi-disk-zfs-image.nix
+++ b/nixos/lib/make-multi-disk-zfs-image.nix
@@ -123,10 +123,10 @@ let
   };
 
   modulesTree = pkgs.aggregateModules (
-    with config.boot.kernelPackages;
+    with config.boot;
     [
-      kernel
-      zfs
+      kernelPackages.kernel
+      kernelPackages.${pkgs.zfs.kernelModuleAttribute}
     ]
   );
 
@@ -254,11 +254,12 @@ let
   image =
     (pkgs.vmTools.override {
       rootModules = [
-        "zfs"
         "9p"
         "9pnet_virtio"
-        "virtio_pci"
         "virtio_blk"
+        "virtio_pci"
+        "virtiofs"
+        "zfs"
       ];
       kernel = modulesTree;
     }).runInLinuxVM
diff --git a/nixos/lib/make-single-disk-zfs-image.nix b/nixos/lib/make-single-disk-zfs-image.nix
index 1641a7f799e2..b41a5d37b0aa 100644
--- a/nixos/lib/make-single-disk-zfs-image.nix
+++ b/nixos/lib/make-single-disk-zfs-image.nix
@@ -111,10 +111,10 @@ let
   };
 
   modulesTree = pkgs.aggregateModules (
-    with config.boot.kernelPackages;
+    with config.boot;
     [
-      kernel
-      zfs
+      kernelPackages.kernel
+      kernelPackages.${pkgs.zfs.kernelModuleAttribute}
     ]
   );
 
@@ -242,11 +242,12 @@ let
   image =
     (pkgs.vmTools.override {
       rootModules = [
-        "zfs"
         "9p"
         "9pnet_virtio"
-        "virtio_pci"
         "virtio_blk"
+        "virtio_pci"
+        "virtiofs"
+        "zfs"
       ];
       kernel = modulesTree;
     }).runInLinuxVM