From 71710fd099ce6c46b54f05c6cf769e73cf11d49f Mon Sep 17 00:00:00 2001 From: Jörg Thalheim Date: Tue, 4 Apr 2017 12:03:21 +0200 Subject: Revert "EC2: Disable PV support" This reverts commit fbe6d23624b0b62cb5754d37ab81007cd4c035ab. this breaks every non-ec2 (non-hvm) system cc @edolstra --- nixos/maintainers/scripts/ec2/create-amis.sh | 13 +++++++------ nixos/modules/virtualisation/amazon-options.nix | 8 +------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh index 24ced8da531..ac43d7dc31a 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 '' -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" diff --git a/nixos/modules/virtualisation/amazon-options.nix b/nixos/modules/virtualisation/amazon-options.nix index cba77d3edd1..34a50dcab16 100644 --- a/nixos/modules/virtualisation/amazon-options.nix +++ b/nixos/modules/virtualisation/amazon-options.nix @@ -12,11 +12,5 @@ }; }; - config = { - assertions = [ - { assertion = config.ec2.hvm; - message = "Paravirtualized EC2 instances are no longer supported."; - } - ]; - }; + config = {}; } -- cgit 1.4.1