diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-08 20:56:33 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-11-08 20:56:33 +0000 |
| commit | 6ec21aa3ca76c131c3f2ea5df0f352595a5c13ef (patch) | |
| tree | a52fa6bfc0c236da628bda8bb9ceb3d74836bda8 /maintainers | |
| parent | 25d7ed12834c0a2d3d3a1cb77c7a0042955186bd (diff) | |
| download | nixpkgs-6ec21aa3ca76c131c3f2ea5df0f352595a5c13ef.tar nixpkgs-6ec21aa3ca76c131c3f2ea5df0f352595a5c13ef.tar.gz nixpkgs-6ec21aa3ca76c131c3f2ea5df0f352595a5c13ef.tar.bz2 nixpkgs-6ec21aa3ca76c131c3f2ea5df0f352595a5c13ef.tar.lz nixpkgs-6ec21aa3ca76c131c3f2ea5df0f352595a5c13ef.tar.xz nixpkgs-6ec21aa3ca76c131c3f2ea5df0f352595a5c13ef.tar.zst nixpkgs-6ec21aa3ca76c131c3f2ea5df0f352595a5c13ef.zip | |
* Urgh. Stupid S3 location names.
svn path=/nixos/trunk/; revision=30346
Diffstat (limited to 'maintainers')
| -rwxr-xr-x | maintainers/scripts/create-amis.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/maintainers/scripts/create-amis.sh b/maintainers/scripts/create-amis.sh index 8ed242001d3..6d67c01327b 100755 --- a/maintainers/scripts/create-amis.sh +++ b/maintainers/scripts/create-amis.sh @@ -21,8 +21,13 @@ buildAndUploadFor() { bucket="$name-$region" + if [ "$region" = eu-west-1 ]; then s3location=EU; + elif [ "$region" = us-east-1 ]; then s3location=US; + else s3location="$region" + fi + ec2-upload-bundle -b "$bucket" -m /tmp/nixos.img.manifest.xml \ - -a "$AWS_ACCESS_KEY_ID" -s "$AWS_SECRET_ACCESS_KEY" --location "$region" + -a "$AWS_ACCESS_KEY_ID" -s "$AWS_SECRET_ACCESS_KEY" --location "$s3location" kernel=$(ec2-describe-images -o amazon --filter "manifest-location=*pv-grub-hd0_1.02-$arch*" --region "$region" | cut -f 2) echo "using PV-GRUB kernel $kernel" |