diff options
| author | lassulus <lassulus@lassul.us> | 2020-12-19 19:41:11 +0100 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2021-04-22 19:52:49 +0200 |
| commit | f3aa040bcbf39935e7e9ac7a7296eac9da7623ec (patch) | |
| tree | d900ba1ca13cbda2cd373ada5e7f9eeb1814f7a8 /nixos/maintainers | |
| parent | cd0ffd3f5fad719586a9b2d06b1faa603da6ba8d (diff) | |
treewide: use auto diskSize for make-disk-image
Diffstat (limited to 'nixos/maintainers')
| -rw-r--r-- | nixos/maintainers/scripts/cloudstack/cloudstack-image.nix | 1 | ||||
| -rw-r--r-- | nixos/maintainers/scripts/ec2/amazon-image.nix | 5 | ||||
| -rw-r--r-- | nixos/maintainers/scripts/openstack/openstack-image.nix | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix b/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix index 37b46db059c0..005f75476e9a 100644 --- a/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix +++ b/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix @@ -10,7 +10,6 @@ with lib; system.build.cloudstackImage = import ../../../lib/make-disk-image.nix { inherit lib config pkgs; - diskSize = 8192; format = "qcow2"; configFile = pkgs.writeText "configuration.nix" '' diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 0ecf07669a11..653744986d13 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -40,8 +40,9 @@ in { }; sizeMB = mkOption { - type = types.int; - default = if config.ec2.hvm then 2048 else 8192; + type = with types; either (enum [ "auto" ]) int; + default = "auto"; + example = 8192; description = "The size in MB of the image"; }; diff --git a/nixos/maintainers/scripts/openstack/openstack-image.nix b/nixos/maintainers/scripts/openstack/openstack-image.nix index 4c464f43f61d..3255e7f3d44d 100644 --- a/nixos/maintainers/scripts/openstack/openstack-image.nix +++ b/nixos/maintainers/scripts/openstack/openstack-image.nix @@ -12,8 +12,8 @@ with lib; system.build.openstackImage = import ../../../lib/make-disk-image.nix { inherit lib config; + additionalSpace = "1024M"; pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package - diskSize = 8192; format = "qcow2"; configFile = pkgs.writeText "configuration.nix" '' |