pyrox.dev
lol
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.
+12
-10
+6
-5
nixos/lib/make-multi-disk-zfs-image.nix
+6
-5
nixos/lib/make-multi-disk-zfs-image.nix
···
123
123
};
124
124
125
125
modulesTree = pkgs.aggregateModules (
126
-
with config.boot.kernelPackages;
126
+
with config.boot;
127
127
[
128
-
kernel
129
-
zfs
128
+
kernelPackages.kernel
129
+
kernelPackages.${pkgs.zfs.kernelModuleAttribute}
130
130
]
131
131
);
132
132
···
254
254
image =
255
255
(pkgs.vmTools.override {
256
256
rootModules = [
257
-
"zfs"
258
257
"9p"
259
258
"9pnet_virtio"
259
+
"virtio_blk"
260
260
"virtio_pci"
261
-
"virtio_blk"
261
+
"virtiofs"
262
+
"zfs"
262
263
];
263
264
kernel = modulesTree;
264
265
}).runInLinuxVM
+6
-5
nixos/lib/make-single-disk-zfs-image.nix
+6
-5
nixos/lib/make-single-disk-zfs-image.nix
···
111
111
};
112
112
113
113
modulesTree = pkgs.aggregateModules (
114
-
with config.boot.kernelPackages;
114
+
with config.boot;
115
115
[
116
-
kernel
117
-
zfs
116
+
kernelPackages.kernel
117
+
kernelPackages.${pkgs.zfs.kernelModuleAttribute}
118
118
]
119
119
);
120
120
···
242
242
image =
243
243
(pkgs.vmTools.override {
244
244
rootModules = [
245
-
"zfs"
246
245
"9p"
247
246
"9pnet_virtio"
247
+
"virtio_blk"
248
248
"virtio_pci"
249
-
"virtio_blk"
249
+
"virtiofs"
250
+
"zfs"
250
251
];
251
252
kernel = modulesTree;
252
253
}).runInLinuxVM