diff options
| author | lassulus <lassulus@lassul.us> | 2020-12-19 19:41:11 +0100 |
|---|---|---|
| committer | Samuel Dionne-Riel <samuel@dionne-riel.com> | 2021-04-24 14:49:07 -0400 |
| commit | 5aa4273e4f5e0ea7d0abd61d57c1c2301e284f23 (patch) | |
| tree | f003e0cfea4ca734e0962ea2b2d0adad6929a08f /nixos/maintainers | |
| parent | ba666011a64aee55c78c9cb4b0e7c272479d9a2e (diff) | |
| download | nixlib-5aa4273e4f5e0ea7d0abd61d57c1c2301e284f23.tar nixlib-5aa4273e4f5e0ea7d0abd61d57c1c2301e284f23.tar.gz nixlib-5aa4273e4f5e0ea7d0abd61d57c1c2301e284f23.tar.bz2 nixlib-5aa4273e4f5e0ea7d0abd61d57c1c2301e284f23.tar.lz nixlib-5aa4273e4f5e0ea7d0abd61d57c1c2301e284f23.tar.xz nixlib-5aa4273e4f5e0ea7d0abd61d57c1c2301e284f23.tar.zst nixlib-5aa4273e4f5e0ea7d0abd61d57c1c2301e284f23.zip | |
treewide: use auto diskSize for make-disk-image
(cherry picked from commit f3aa040bcbf39935e7e9ac7a7296eac9da7623ec)
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" '' |