From 6a8359a92ab501ae62739e9d3302f48e3e73c750 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 24 Apr 2021 00:42:22 +0000 Subject: [PATCH] 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. --- nixos/maintainers/scripts/ec2/amazon-image.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index 653744986d13..b05467fb9b89 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"; };