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/lib | |
| parent | f3f8c584a41a21b69ac7e7c1d8f19e1a8ba997be (diff) | |
| download | nixlib-5f372ef67f2aae033e50c1f96bcb2abb7b3a12c1.tar nixlib-5f372ef67f2aae033e50c1f96bcb2abb7b3a12c1.tar.gz nixlib-5f372ef67f2aae033e50c1f96bcb2abb7b3a12c1.tar.bz2 nixlib-5f372ef67f2aae033e50c1f96bcb2abb7b3a12c1.tar.lz nixlib-5f372ef67f2aae033e50c1f96bcb2abb7b3a12c1.tar.xz nixlib-5f372ef67f2aae033e50c1f96bcb2abb7b3a12c1.tar.zst nixlib-5f372ef67f2aae033e50c1f96bcb2abb7b3a12c1.zip | |
amazon-image: support VPC/VHD as an output format for the builder
Diffstat (limited to 'nixos/lib')
| -rw-r--r-- | nixos/lib/make-disk-image.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 56766ec9047f..9c91bf392251 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} ''; |