summaryrefslogtreecommitdiffstats
path: root/nixos/maintainers
diff options
context:
space:
mode:
authorDan Peebles <pumpkin@me.com>2017-08-10 21:40:21 +0000
committerDan Peebles <pumpkin@me.com>2017-08-10 21:40:42 +0000
commitf3f8c584a41a21b69ac7e7c1d8f19e1a8ba997be (patch)
treebc4de750a816ab788e2536726a2ad4146cb8aed5 /nixos/maintainers
parentb1ce017d44c5a79477b7c1d10a728f5907c62d9a (diff)
amazon-image: Add disk format option to image builder module
Diffstat (limited to 'nixos/maintainers')
-rw-r--r--nixos/maintainers/scripts/ec2/amazon-image.nix9
1 files changed, 7 insertions, 2 deletions
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index cdfac71634d4..7541fbc86917 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -22,15 +22,20 @@ in {
generated image. Glob patterns work.
'';
};
+
+ format = mkOption {
+ type = types.enum [ "raw" "qcow2" ];
+ default = "qcow2";
+ description = "The image format to output";
+ };
};
config.system.build.amazonImage = import ../../../lib/make-disk-image.nix {
inherit lib config;
- inherit (cfg) contents;
+ inherit (cfg) contents format;
pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package
partitioned = config.ec2.hvm;
diskSize = if config.ec2.hvm then 2048 else 8192;
- format = "qcow2";
configFile = pkgs.writeText "configuration.nix"
''
{