public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "EC2: Disable PV support"

Browse Source 
This reverts commit fbe6d23624b0b62cb5754d37ab81007cd4c035ab.

this breaks every non-ec2 (non-hvm) system

cc @edolstra
This commit is contained in:
Jörg Thalheim 2017-04-04 12:03:21 +02:00
parent f3dbaa7b57
commit 71710fd099
No known key found for this signature in database
GPG Key ID: CA4106B8D7CC79FA
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nixos/maintainers/scripts/ec2/create-amis.sh
View File

@ -3,20 +3,21 @@
# To start with do: nix-shell -p awscli --run "aws configure" # To start with do: nix-shell -p awscli --run "aws configure"
set -e
set -o pipefail 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) version=$(nix-instantiate --eval --strict '<nixpkgs>' -A lib.nixpkgsVersion | sed s/'"'//g)
major=${version:0:5} major=${version:0:5}
echo "NixOS version is $version ($major)" 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 rm -f ec2-amis.nix
types="hvm" types="hvm pv"
stores="ebs s3" 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" 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"

8
nixos/modules/virtualisation/amazon-options.nix
View File

@ -12,11 +12,5 @@
}; };
}; };
config = { config = {};
assertions = [
{ assertion = config.ec2.hvm;
message = "Paravirtualized EC2 instances are no longer supported.";
}
];
};
} }