nix-community/disko
1
1
Fork 0
mirror of https://github.com/nix-community/disko.git synced 2024-09-17 09:37:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

make-disk-image: inherit kernel from nixosConfiguration

Browse Source
This commit is contained in:
matthewcroughan 2023-12-14 12:01:52 +00:00 committed by mergify[bot]
parent d5cf2e3d61
commit bb75ad0b1d
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/make-disk-image.nix
View File

@ -7,6 +7,11 @@
, checked ? false
}:
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 ]);
};
cleanedConfig = diskoLib.testLib.prepareDiskoConfig nixosConfig.config diskoLib.testLib.devices;
systemToInstall = nixosConfig.extendModules {
modules = [{
@ -61,7 +66,7 @@ let
QEMU_OPTS = lib.concatMapStringsSep " " (disk: "-drive file=${disk.name}.raw,if=virtio,cache=unsafe,werror=report") (lib.attrValues nixosConfig.config.disko.devices.disk);
in
{
pure = pkgs.vmTools.runInLinuxVM (pkgs.runCommand name
pure = vmTools.runInLinuxVM (pkgs.runCommand name
{
buildInputs = dependencies;
inherit preVM postVM QEMU_OPTS;
@ -160,7 +165,7 @@ in
QEMU_OPTS+=" -m $build_memory"
export QEMU_OPTS
${pkgs.bash}/bin/sh -e ${pkgs.vmTools.vmRunCommand pkgs.vmTools.qemuCommandLinux}
${pkgs.bash}/bin/sh -e ${vmTools.vmRunCommand vmTools.qemuCommandLinux}
cd /
'';
}

7
module.nix
View File

@ -10,6 +10,13 @@ let
in
{
options.disko = {
extraRootModules = lib.mkOption {
type = lib.types.listOf lib.types.str ;
description = ''
extra modules to pass to the vmTools.runCommand invocation in the make-disk-image.nix builder
'';
default = [];
};
memSize = lib.mkOption {
type = lib.types.int;
description = ''