From 4fb91cbafe6fd51d2c23bb15e0d5aae61143b6a9 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Sat, 24 Apr 2021 02:38:36 +0000
Subject: [PATCH] Revert "treewide: use auto diskSize for make-disk-image"

This reverts commit f3aa040bcbf39935e7e9ac7a7296eac9da7623ec.
---
 nixos/maintainers/scripts/cloudstack/cloudstack-image.nix | 1 +
 nixos/maintainers/scripts/ec2/amazon-image.nix            | 5 ++---
 nixos/maintainers/scripts/openstack/openstack-image.nix   | 2 +-
 nixos/modules/virtualisation/azure-image.nix              | 5 ++---
 nixos/modules/virtualisation/digital-ocean-image.nix      | 5 ++---
 nixos/modules/virtualisation/google-compute-image.nix     | 5 ++---
 nixos/modules/virtualisation/hyperv-image.nix             | 5 ++---
 nixos/modules/virtualisation/virtualbox-image.nix         | 5 ++---
 nixos/modules/virtualisation/vmware-image.nix             | 5 ++---
 9 files changed, 16 insertions(+), 22 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"
       ''
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index 03dd3c05130..60fed3222ef 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -9,9 +9,8 @@ in
 
   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.
       '';
diff --git a/nixos/modules/virtualisation/digital-ocean-image.nix b/nixos/modules/virtualisation/digital-ocean-image.nix
index 0ff2ee591f2..b582e235d43 100644
--- a/nixos/modules/virtualisation/digital-ocean-image.nix
+++ b/nixos/modules/virtualisation/digital-ocean-image.nix
@@ -10,9 +10,8 @@ in
 
   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.
       '';
diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix
index 79c3921669e..e2332df611a 100644
--- a/nixos/modules/virtualisation/google-compute-image.nix
+++ b/nixos/modules/virtualisation/google-compute-image.nix
@@ -18,9 +18,8 @@ in
 
   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.
       '';
diff --git a/nixos/modules/virtualisation/hyperv-image.nix b/nixos/modules/virtualisation/hyperv-image.nix
index 6845d675009..fabc9113dfc 100644
--- a/nixos/modules/virtualisation/hyperv-image.nix
+++ b/nixos/modules/virtualisation/hyperv-image.nix
@@ -9,9 +9,8 @@ in {
   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.
         '';
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 071edda8269..fa580e8b42d 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -11,9 +11,8 @@ in {
   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.
         '';
diff --git a/nixos/modules/virtualisation/vmware-image.nix b/nixos/modules/virtualisation/vmware-image.nix
index f6cd12e2bb7..9da9e145f7a 100644
--- a/nixos/modules/virtualisation/vmware-image.nix
+++ b/nixos/modules/virtualisation/vmware-image.nix
@@ -18,9 +18,8 @@ in {
   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.
         '';