diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2017-04-04 12:03:21 +0200 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2017-04-04 12:05:21 +0200 |
commit | 71710fd099ce6c46b54f05c6cf769e73cf11d49f (patch) | |
tree | cda1f96bbc718db4853a559372a0442f26535c2d /nixos/maintainers/scripts | |
parent | f3dbaa7b573b5a5acafbc847a32771e78248c7e7 (diff) |
Revert "EC2: Disable PV support"
This reverts commit fbe6d23624b0b62cb5754d37ab81007cd4c035ab. this breaks every non-ec2 (non-hvm) system cc @edolstra
Diffstat (limited to 'nixos/maintainers/scripts')
-rwxr-xr-x | nixos/maintainers/scripts/ec2/create-amis.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 24ced8da531a0..ac43d7dc31a24 100755 --- a/nixos/maintainers/scripts/ec2/create-amis.sh +++ b/nixos/maintainers/scripts/ec2/create-amis.sh @@ -3,20 +3,21 @@ # To start with do: nix-shell -p awscli --run "aws configure" -set -e + set -o pipefail +#set -x + +stateDir=${TMPDIR:-/tmp}/ec2-image +echo "keeping state in $stateDir" +mkdir -p $stateDir version=$(nix-instantiate --eval --strict '<nixpkgs>' -A lib.nixpkgsVersion | sed s/'"'//g) major=${version:0:5} echo "NixOS version is $version ($major)" -stateDir=/var/tmp/ec2-image-$version -echo "keeping state in $stateDir" -mkdir -p $stateDir - rm -f ec2-amis.nix -types="hvm" +types="hvm pv" stores="ebs s3" regions="eu-west-1 eu-west-2 eu-central-1 us-east-1 us-east-2 us-west-1 us-west-2 ca-central-1 ap-southeast-1 ap-southeast-2 ap-northeast-1 ap-northeast-2 sa-east-1 ap-south-1" |