Merge pull request #120487 from lukegb/temp-ec2-fixed-disk

treewide: revert auto disk sizing for images

+1
nixos/maintainers/scripts/cloudstack/cloudstack-image.nix
···
system.build.cloudstackImage = import ../../../lib/make-disk-image.nix {
inherit lib config pkgs;
+
diskSize = 8192;
format = "qcow2";
configFile = pkgs.writeText "configuration.nix"
''
+1 -3
nixos/maintainers/scripts/ec2/amazon-image.nix
···
};
sizeMB = mkOption {
-
type = with types; either (enum [ "auto" ]) int;
-
# TODO(lukegb): this should be "auto"; see #120473
+
type = types.int;
default = if config.ec2.hvm then 2048 else 8192;
-
example = 8192;
description = "The size in MB of the image";
};
+1 -1
nixos/maintainers/scripts/openstack/openstack-image.nix
···
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"
''
+2 -3
nixos/modules/virtualisation/azure-image.nix
···
options = {
virtualisation.azureImage.diskSize = mkOption {
-
type = with types; either (enum [ "auto" ]) int;
-
default = "auto";
-
example = 2048;
+
type = with types; int;
+
default = 2048;
description = ''
Size of disk image. Unit is MB.
'';
+2 -3
nixos/modules/virtualisation/digital-ocean-image.nix
···
options = {
virtualisation.digitalOceanImage.diskSize = mkOption {
-
type = with types; either (enum [ "auto" ]) int;
-
default = "auto";
-
example = 4096;
+
type = with types; int;
+
default = 4096;
description = ''
Size of disk image. Unit is MB.
'';
+2 -3
nixos/modules/virtualisation/google-compute-image.nix
···
options = {
virtualisation.googleComputeImage.diskSize = mkOption {
-
type = with types; either (enum [ "auto" ]) int;
-
default = "auto";
-
example = 1536;
+
type = with types; int;
+
default = 1536;
description = ''
Size of disk image. Unit is MB.
'';
+2 -3
nixos/modules/virtualisation/hyperv-image.nix
···
options = {
hyperv = {
baseImageSize = mkOption {
-
type = with types; either (enum [ "auto" ]) int;
-
default = "auto";
-
example = 2048;
+
type = types.int;
+
default = 2048;
description = ''
The size of the hyper-v base image in MiB.
'';
+2 -3
nixos/modules/virtualisation/virtualbox-image.nix
···
options = {
virtualbox = {
baseImageSize = mkOption {
-
type = with types; either (enum [ "auto" ]) int;
-
default = "auto";
-
example = 50 * 1024;
+
type = types.int;
+
default = 50 * 1024;
description = ''
The size of the VirtualBox base image in MiB.
'';
+2 -3
nixos/modules/virtualisation/vmware-image.nix
···
options = {
vmware = {
baseImageSize = mkOption {
-
type = with types; either (enum [ "auto" ]) int;
-
default = "auto";
-
example = 2048;
+
type = types.int;
+
default = 2048;
description = ''
The size of the VMWare base image in MiB.
'';