Merge pull request #246845 from jakeschurch/add-proxmox-image-disk-size-followup

update(proxmox-image): update pull request #246120 from jakeschurch/add-prox…
This commit is contained in:
Pol Dellaiera 2023-08-02 22:55:40 +02:00 committed by GitHub
commit b3e46b47d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -147,14 +147,6 @@ with lib;
defaultText = lib.literalExpression ''if config.proxmox.qemuConf.bios == "seabios" then "legacy" else "efi"'';
example = "hybrid";
};
additionalSpace = mkOption {
type = 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).
'';
};
filenameSuffix = mkOption {
type = types.str;
default = config.proxmox.qemuConf.name;
@ -205,7 +197,7 @@ with lib;
];
system.build.VMA = import ../../lib/make-disk-image.nix {
name = "proxmox-${cfg.filenameSuffix}";
inherit (cfg) partitionTableType additionalSpace;
inherit (cfg) partitionTableType;
postVM = let
# Build qemu with PVE's patch that adds support for the VMA format
vma = (pkgs.qemu_kvm.override {