From 6ec21aa3ca76c131c3f2ea5df0f352595a5c13ef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 8 Nov 2011 20:56:33 +0000
Subject: [PATCH] * Urgh.  Stupid S3 location names.

svn path=/nixos/trunk/; revision=30346
---
 maintainers/scripts/create-amis.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/maintainers/scripts/create-amis.sh b/maintainers/scripts/create-amis.sh
index 8ed242001d3c..6d67c01327b8 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"