From f3f8c584a41a21b69ac7e7c1d8f19e1a8ba997be Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Thu, 10 Aug 2017 21:40:21 +0000 Subject: amazon-image: Add disk format option to image builder module --- nixos/maintainers/scripts/ec2/amazon-image.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'nixos/maintainers/scripts/ec2/amazon-image.nix') diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix index cdfac71634d..7541fbc8691 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" '' { -- cgit 1.4.1