diff options
| author | Dan Peebles <pumpkin@me.com> | 2017-08-10 22:57:26 +0000 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2017-08-10 22:57:26 +0000 |
| commit | 5f372ef67f2aae033e50c1f96bcb2abb7b3a12c1 (patch) | |
| tree | 701dfbc1e03666346bca0b95eb84962137fd4245 /nixos | |
| parent | f3f8c584a41a21b69ac7e7c1d8f19e1a8ba997be (diff) | |
| download | nixpkgs-5f372ef67f2aae033e50c1f96bcb2abb7b3a12c1.tar nixpkgs-5f372ef67f2aae033e50c1f96bcb2abb7b3a12c1.tar.gz nixpkgs-5f372ef67f2aae033e50c1f96bcb2abb7b3a12c1.tar.bz2 nixpkgs-5f372ef67f2aae033e50c1f96bcb2abb7b3a12c1.tar.lz nixpkgs-5f372ef67f2aae033e50c1f96bcb2abb7b3a12c1.tar.xz nixpkgs-5f372ef67f2aae033e50c1f96bcb2abb7b3a12c1.tar.zst nixpkgs-5f372ef67f2aae033e50c1f96bcb2abb7b3a12c1.zip | |
amazon-image: support VPC/VHD as an output format for the builder
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/make-disk-image.nix | 10 | ||||
| -rw-r--r-- | nixos/maintainers/scripts/ec2/amazon-image.nix | 2 |
2 files changed, 9 insertions, 3 deletions
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"; }; |