Merge pull request #218043 from addict3d/parameterise-guest-memsize-1

nixos/lib/make-disk-image: expose memSize parameter

Changed files
+9 -1
doc
builders
nixos
+1
doc/builders/images/makediskimage.section.md
···
diskSize = "auto";
additionalSpace = "0M"; # Defaults to 512M.
copyChannel = false;
+
memSize = 2048; # Qemu VM memory size in megabytes. Defaults to 1024M.
}
```
+4 -1
nixos/lib/make-disk-image.nix
···
, # Shell code executed after the VM has finished.
postVM ? ""
+
, # Guest memory size
+
memSize ? 1024
+
, # Copy the contents of the Nix store to the root of the image and
# skip further setup. Incompatible with `contents`,
# `installBootLoader` and `configFile`.
···
"-drive if=pflash,format=raw,unit=1,file=$efiVars"
]
);
-
memSize = 1024;
+
inherit memSize;
} ''
export PATH=${binPath}:$PATH
+4
nixos/lib/make-multi-disk-zfs-image.nix
···
, # Shell code executed after the VM has finished.
postVM ? ""
+
, # Guest memory size
+
memSize ? 1024
+
, name ? "nixos-disk-image"
, # Disk image format, one of qcow2, qcow2-compressed, vdi, vpc, raw.
···
{
QEMU_OPTS = "-drive file=$bootDiskImage,if=virtio,cache=unsafe,werror=report"
+ " -drive file=$rootDiskImage,if=virtio,cache=unsafe,werror=report";
+
inherit memSize;
preVM = ''
PATH=$PATH:${pkgs.qemu_kvm}/bin
mkdir $out