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/modules/virtualisation/amazon-image.nix | |
| parent | 184b7ba3c684c5be64c4908ac4973f71865acf4e (diff) | |
| download | nixlib-0d3738cdcc48bd32a7eae9b914440b67c8db252e.tar nixlib-0d3738cdcc48bd32a7eae9b914440b67c8db252e.tar.gz nixlib-0d3738cdcc48bd32a7eae9b914440b67c8db252e.tar.bz2 nixlib-0d3738cdcc48bd32a7eae9b914440b67c8db252e.tar.lz nixlib-0d3738cdcc48bd32a7eae9b914440b67c8db252e.tar.xz nixlib-0d3738cdcc48bd32a7eae9b914440b67c8db252e.tar.zst nixlib-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/modules/virtualisation/amazon-image.nix')
| -rw-r--r-- | nixos/modules/virtualisation/amazon-image.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index 35af905bc628..5d99bccb0e93 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -65,8 +65,7 @@ let cfg = config.ec2; in fi if ! [ -e "$metaDir/user-data" ]; then - wget -q -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data - chmod 600 "$metaDir/user-data" + wget -q -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data && chmod 600 "$metaDir/user-data" fi if ! [ -e "$metaDir/hostname" ]; then |