diff options
| author | Luke Granger-Brown <git@lukegb.com> | 2021-04-24 02:38:36 +0000 |
|---|---|---|
| committer | Luke Granger-Brown <git@lukegb.com> | 2021-04-24 02:38:36 +0000 |
| commit | 4fb91cbafe6fd51d2c23bb15e0d5aae61143b6a9 (patch) | |
| tree | 3d74e65641af7f18140452cbc72def8f15fde0e2 /nixos/maintainers | |
| parent | f521b12b0ed0a5ec96153542bea5705cb1a2b470 (diff) | |
| download | nixpkgs-4fb91cbafe6fd51d2c23bb15e0d5aae61143b6a9.tar nixpkgs-4fb91cbafe6fd51d2c23bb15e0d5aae61143b6a9.tar.gz nixpkgs-4fb91cbafe6fd51d2c23bb15e0d5aae61143b6a9.tar.bz2 nixpkgs-4fb91cbafe6fd51d2c23bb15e0d5aae61143b6a9.tar.lz nixpkgs-4fb91cbafe6fd51d2c23bb15e0d5aae61143b6a9.tar.xz nixpkgs-4fb91cbafe6fd51d2c23bb15e0d5aae61143b6a9.tar.zst nixpkgs-4fb91cbafe6fd51d2c23bb15e0d5aae61143b6a9.zip | |
Revert "treewide: use auto diskSize for make-disk-image"
This reverts 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 005f75476e9..37b46db059c 100644 --- a/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix +++ b/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix @@ -10,6 +10,7 @@ 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 653744986d1..0ecf07669a1 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -40,9 +40,8 @@ in { }; sizeMB = mkOption { - type = with types; either (enum [ "auto" ]) int; - default = "auto"; - example = 8192; + type = types.int; + default = if config.ec2.hvm then 2048 else 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 3255e7f3d44..4c464f43f61 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" '' |