amazon-grow-partition module: rename to grow-partition

nixos/modules/virtualisation/amazon-image.nix

@@ -11,10 +11,12 @@ with lib;
 let cfg = config.ec2; in
 
 {
-  imports = [ ../profiles/headless.nix ./ec2-data.nix ./amazon-grow-partition.nix ./amazon-init.nix ];
+  imports = [ ../profiles/headless.nix ./ec2-data.nix ./grow-partition.nix ./amazon-init.nix ];
 
   config = {
 
+    virtualisation.growPartition = cfg.hvm;
+
     fileSystems."/" = {
       device = "/dev/disk/by-label/nixos";
       autoResize = true;

nixos/modules/virtualisation/grow-partition.nix

@@ -1,11 +1,22 @@
-# This module automatically grows the root partition on Amazon EC2 HVM
+# This module automatically grows the root partition on virtual machines.
-# instances. This allows an instance to be created with a bigger root
+# This allows an instance to be created with a bigger root filesystem
-# filesystem than provided by the AMI.
+# than provided by the machine image.
 
 { config, lib, pkgs, ... }:
 
 {
-  config = lib.mkIf config.ec2.hvm {
+
+  options = {
+
+    virtualisation.growPartition = mkOption {
+      type = types.bool;
+      default = true;
+    };
+
+  };
+
+  config = mkIf config.virtualisation.growPartition {
+
     boot.initrd.extraUtilsCommands = ''
       copy_bin_and_libs ${pkgs.gawk}/bin/gawk
       copy_bin_and_libs ${pkgs.gnused}/bin/sed
@@ -24,5 +35,7 @@
         udevadm settle
       fi
     '';
+
   };
+
 }