| 5 Jul 2024 |
 matthewcroughan | Anyone wanna help? | 20:36:48 |
| matthewcroughan | blikvm-v1-disko-images> qemu-system-aarch64: failed to load "/nix/store/d2vw2hx48nphic1n4xd8y43q5vdn4lfk-kernel-modules/vmlinuz.efi" | 20:36:49 |
| matthewcroughan | why would that happen.. | 20:36:56 |
| matthewcroughan | this is me, trying to make my PR to make the image builder kernel configurable | 20:41:18 |
| matthewcroughan | It's quite a minimal PR | 20:41:41 |
| matthewcroughan | diff --git a/lib/make-disk-image.nix b/lib/make-disk-image.nix
index a61e937..e1f7e36 100644
--- a/lib/make-disk-image.nix
+++ b/lib/make-disk-image.nix
@@ -10,7 +10,7 @@ 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.disko.imageBuilderKernelPackages; [ kernel ]
++ lib.optional (lib.elem "zfs" nixosConfig.config.disko.extraRootModules) zfs);
};
cleanedConfig = diskoLib.testLib.prepareDiskoConfig nixosConfig.config diskoLib.testLib.devices;
diff --git a/module.nix b/module.nix
index 8c8fbc3..e3fde41 100644
--- a/module.nix
+++ b/module.nix
@@ -10,6 +10,15 @@ let
in
{
options.disko = {
+ imageBuilderKernelPackages = lib.mkOption {
+ type = lib.types.attrs;
+ description = ''
+ the kernel used when building disk images via make-disk-image.nix.
+ Useful when the config's kernel won't boot in the image-builder.
+ '';
+ default = config.boot.kernelPackages;
+ example = lib.literalExpression "pkgs.linuxPackages_testing";
+ };
extraRootModules = lib.mkOption {
type = lib.types.listOf lib.types.str;
description = ''
| 20:41:59 |
|  ૮༼⚆︿⚆༽つ / wildan joined the room. | 20:46:17 |
| matthewcroughan | Oh.. it's because my config for the thing I'm building an image for actually modifies the nixpkgs.hostPlatform of the disko image builder.. | 21:30:45 |
| matthewcroughan | it's a bit too intertwined I think | 21:30:50 |
| matthewcroughan | disko's image builder should not care about the nixosConfig as much as it does, it inherits too much | 21:31:18 |
| matthewcroughan | i.e it needs its own pkgs instance, uneffected by the nixosConfig's overlays and stuff | 21:32:15 |
