Merge pull request #2824 from justincormack/aws-fixes

Fix sriov flag on AWS

docs/platform-aws.md

@@ -27,6 +27,9 @@ $ linuxkit build -format aws examples/aws.yml
 
 ## Push image
 
+Before you do this you need to create a `vmimport` service role as explained in
+[the VM import documentation](http://docs.aws.amazon.com/vm-import/latest/userguide/vmimport-image-import.html).
+
 Do `linuxkit push aws -bucket bucketname aws.raw` to upload it to the
 specified bucket, and create a bootable image from the stored image.
 

src/cmd/linuxkit/push_aws.go

@@ -48,6 +48,9 @@ func pushAWS(args []string) {
 	timeout := getIntValue(timeoutVar, *timeoutFlag, 600)
 	bucket := getStringValue(bucketVar, *bucketFlag, "")
 	name := getStringValue(nameVar, *nameFlag, "")
+	if *sriovNetFlag == "" {
+		sriovNetFlag = nil
+	}
 
 	sess := session.Must(session.NewSession())
 	storage := s3.New(sess)