Revert "EC2: Disable PV support"

This reverts commit fbe6d23. this breaks every non-ec2 (non-hvm) system cc @edolstra
NixOS · Apr 4, 2017 · 71710fd · 71710fd
1 parent f3dbaa7
commit 71710fd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git 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"
 

diff --git 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 = {};
 }