diff options
| author | Luke Granger-Brown <git@lukegb.com> | 2021-04-24 00:42:22 +0000 |
|---|---|---|
| committer | Luke Granger-Brown <git@lukegb.com> | 2021-04-24 00:43:47 +0000 |
| commit | 6a8359a92ab501ae62739e9d3302f48e3e73c750 (patch) | |
| tree | f50fa4a4a480913d6f144cb6524c8f1e31a9354d /nixos/maintainers/scripts/ec2/amazon-image.nix | |
| parent | c298ef8855f6ad629da5e09aab36ee673473316c (diff) | |
| download | nixpkgs-6a8359a92ab501ae62739e9d3302f48e3e73c750.tar nixpkgs-6a8359a92ab501ae62739e9d3302f48e3e73c750.tar.gz nixpkgs-6a8359a92ab501ae62739e9d3302f48e3e73c750.tar.bz2 nixpkgs-6a8359a92ab501ae62739e9d3302f48e3e73c750.tar.lz nixpkgs-6a8359a92ab501ae62739e9d3302f48e3e73c750.tar.xz nixpkgs-6a8359a92ab501ae62739e9d3302f48e3e73c750.tar.zst nixpkgs-6a8359a92ab501ae62739e9d3302f48e3e73c750.zip | |
nixos/amazon-image: (temporarily) use fixed disk size again
As a temporary workaround for #120473 while the image builder is patched to correctly look up disk sizes, partially revert f3aa040bcbf39935e7e9ac7a7296eac9da7623ec for EC2 disk images only. We retain the type allowing "auto" but set the default back to the previous value.
Diffstat (limited to 'nixos/maintainers/scripts/ec2/amazon-image.nix')
| -rw-r--r-- | nixos/maintainers/scripts/ec2/amazon-image.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 653744986d1..b05467fb9b8 100644 --- a/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -41,7 +41,8 @@ in { sizeMB = mkOption { type = with types; either (enum [ "auto" ]) int; - default = "auto"; + # TODO(lukegb): this should be "auto"; see #120473 + default = if config.ec2.hvm then 2048 else 8192; example = 8192; description = "The size in MB of the image"; }; |