From 5f372ef67f2aae033e50c1f96bcb2abb7b3a12c1 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Thu, 10 Aug 2017 22:57:26 +0000
Subject: amazon-image: support VPC/VHD as an output format for the builder

---
 nixos/lib/make-disk-image.nix                  | 10 ++++++++--
 nixos/maintainers/scripts/ec2/amazon-image.nix |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'nixos')

diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix
index 56766ec9047..9c91bf39225 100644
--- a/nixos/lib/make-disk-image.nix
+++ b/nixos/lib/make-disk-image.nix
@@ -39,6 +39,12 @@
 with lib;
 
 let
+  extensions = {
+    qcow2 = "qcow2";
+    vpc   = "vhd";
+    raw   = "img";
+  };
+
   # Copied from https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/installer/cd-dvd/channel.nix
   # TODO: factor out more cleanly
 
@@ -142,8 +148,8 @@ in pkgs.vmTools.runInLinuxVM (
           mv $diskImage $out/nixos.img
           diskImage=$out/nixos.img
         '' else ''
-          ${pkgs.qemu}/bin/qemu-img convert -f raw -O qcow2 $diskImage $out/nixos.qcow2
-          diskImage=$out/nixos.qcow2
+          ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${format} $diskImage $out/nixos.${extensions.${format}}
+          diskImage=$out/nixos.${extensions.${format}}
         ''}
         ${postVM}
       '';
diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index 7541fbc8691..955fdff7953 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -24,7 +24,7 @@ in {
     };
 
     format = mkOption {
-      type = types.enum [ "raw" "qcow2" ];
+      type = types.enum [ "raw" "qcow2" "vpc" ];
       default = "qcow2";
       description = "The image format to output";
     };
-- 
cgit 1.4.1