colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

respond to pr feedback

Browse Source 
Signed-off-by: Jake Schurch <jakeschurch@gmail.com>
This commit is contained in:
Jake Schurch 2023-07-30 12:01:03 -04:00
parent d780bdf308
commit a479735162
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nixos/modules/virtualisation/proxmox-image.nix
View File

@ -94,15 +94,6 @@ with lib;
Expect guest to have qemu agent running
'';
};
additionalDiskSize = lib.mkOption {
type = lib.types.str;
default = "512M";
description = lib.mdDoc ''
Additional disk space to be added to the image.
Defaults to 512M (Megabytes), Suffix can also be specified with `G` (gigabyte) or `K` (kilobyte).
'';
};
};
qemuExtraConf = mkOption {
type = with types; attrsOf (oneOf [ str int ]);
@ -126,7 +117,7 @@ with lib;
defaultText = lib.literalExpression ''if config.proxmox.qemuConf.bios == "seabios" then "legacy" else "efi"'';
example = "hybrid";
};
additionalDiskSpace = mkOption {
additionalSpace = mkOption {
type = types.str;
default = "512M";
description = lib.mdDoc ''
@ -184,8 +175,7 @@ with lib;
];
system.build.VMA = import ../../lib/make-disk-image.nix {
name = "proxmox-${cfg.filenameSuffix}";
inherit partitionTableType;
additionalSpace = config.proxmox.additionalDiskSpace;
inherit (cfg) partitionTableType additionalSpace;
postVM = let
# Build qemu with PVE's patch that adds support for the VMA format
vma = (pkgs.qemu_kvm.override {