Revert "Revert "EC2: Disable PV support""

This reverts commit 71710fd099ce6c46b54f05c6cf769e73cf11d49f.

+13 -8
+6 -7
nixos/maintainers/scripts/ec2/create-amis.sh
··· 3 3 4 4 # To start with do: nix-shell -p awscli --run "aws configure" 5 5 6 - 6 + set -e 7 7 set -o pipefail 8 - #set -x 9 - 10 - stateDir=${TMPDIR:-/tmp}/ec2-image 11 - echo "keeping state in $stateDir" 12 - mkdir -p $stateDir 13 8 14 9 version=$(nix-instantiate --eval --strict '<nixpkgs>' -A lib.nixpkgsVersion | sed s/'"'//g) 15 10 major=${version:0:5} 16 11 echo "NixOS version is $version ($major)" 17 12 13 + stateDir=/var/tmp/ec2-image-$version 14 + echo "keeping state in $stateDir" 15 + mkdir -p $stateDir 16 + 18 17 rm -f ec2-amis.nix 19 18 20 - types="hvm pv" 19 + types="hvm" 21 20 stores="ebs s3" 22 21 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" 23 22
+7 -1
nixos/modules/virtualisation/amazon-options.nix
··· 12 12 }; 13 13 }; 14 14 15 - config = {}; 15 + config = { 16 + assertions = [ 17 + { assertion = config.ec2.hvm; 18 + message = "Paravirtualized EC2 instances are no longer supported."; 19 + } 20 + ]; 21 + }; 16 22 }