diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-30 21:48:12 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2016-03-30 21:50:23 +0200 |
| commit | 0d3738cdcc48bd32a7eae9b914440b67c8db252e (patch) | |
| tree | 0d26f5a0b694f98adf0acfc5edb29ccf5a3f9f37 /nixos/lib/make-disk-image.nix | |
| parent | 184b7ba3c684c5be64c4908ac4973f71865acf4e (diff) | |
| download | nixpkgs-0d3738cdcc48bd32a7eae9b914440b67c8db252e.tar nixpkgs-0d3738cdcc48bd32a7eae9b914440b67c8db252e.tar.gz nixpkgs-0d3738cdcc48bd32a7eae9b914440b67c8db252e.tar.bz2 nixpkgs-0d3738cdcc48bd32a7eae9b914440b67c8db252e.tar.lz nixpkgs-0d3738cdcc48bd32a7eae9b914440b67c8db252e.tar.xz nixpkgs-0d3738cdcc48bd32a7eae9b914440b67c8db252e.tar.zst nixpkgs-0d3738cdcc48bd32a7eae9b914440b67c8db252e.zip | |
Fix the EC2 test
We now generate a qcow2 image to prevent hitting Hydra's output size limit. Also updated /root/user-data -> /etc/ec2-metadata/user-data. http://hydra.nixos.org/build/33843133
Diffstat (limited to 'nixos/lib/make-disk-image.nix')
| -rw-r--r-- | nixos/lib/make-disk-image.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 7387bf14738..caf0ab4c07b 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -23,6 +23,8 @@ postVM ? "" , name ? "nixos-disk-image" + +, format ? "raw" }: with lib; @@ -32,8 +34,8 @@ pkgs.vmTools.runInLinuxVM ( { preVM = '' mkdir $out - diskImage=$out/nixos.img - ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage "${toString diskSize}M" + diskImage=$out/nixos.${if format == "qcow2" then "qcow2" else "img"} + ${pkgs.vmTools.qemu}/bin/qemu-img create -f ${format} $diskImage "${toString diskSize}M" mv closure xchg/ ''; buildInputs = [ pkgs.utillinux pkgs.perl pkgs.e2fsprogs pkgs.parted ]; |