From 80c014d702a2e62061067f9644637a65ffa8280e Mon Sep 17 00:00:00 2001
From: tomalok <tomalok@gmail.com>
Date: Sat, 19 Jan 2019 11:58:34 -0800
Subject: [PATCH] fix 3.8 ena drivers (#33)

* go back to using linux-virt@edge-main, which has ena drivers
* other misc fixes
  * update README
  * use --no-cache when installing alpine-base
---
 README.md   | 13 ++++++-------
 make_ami.sh |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 2cb9b78..893075a 100644
--- a/README.md
+++ b/README.md
@@ -56,16 +56,15 @@ its development and thus there are some sharp edges.
   setting will work as will setting the ssh keys for the Alpine user based on
   what was configured during instance launch. User data is supported as long
   as it's a shell script (starts with #!). See the tiny-ec2-bootstrap README
-  for more details. You can still install cloud-init using aports but the
-  version in the tree is somewhat old and may not work correctly for Alpine.
-  If full cloud-init support is important to you please file a bug against this
-  project.
+  for more details. You can still install cloud-init (from the edge/3.9 testing
+  repositories), but we haven't tested whether it will not work correctly for
+  this AMI.  If full cloud-init support is important to you please file a bug
+  against this project.
 
 - Because several key packages in Alpine 3.8 are missing or lacking features,
   we currently need to install some packages from edge.  We expect that these
-  will be included in Alpine 3.9, or perhaps as a 3.8.x update.
-  - linux-virt @edge-main (includes necessary NVMe drivers)
-  - aws-ena-driver @edge-community (installs 'virt' flavored subpackage)
+  will be included in Alpine 3.9.
+  - linux-virt @edge-main (includes necessary ENA drivers)
   - tiny-ec2-bootstrap @edge-main  (updated to v1.2.0)
 
 - CloudFormation support is still forthcoming. This requires patches and
diff --git a/make_ami.sh b/make_ami.sh
index 7652edc..b5097ab 100755
--- a/make_ami.sh
+++ b/make_ami.sh
@@ -131,7 +131,7 @@ install_core_packages() {
     # tiny-ec2-bootstrap - to bootstrap system from EC2 metadata
     #
     chroot "$target" apk --no-cache add \
-        linux-virt \
+        linux-virt@edge-main \
         alpine-mirrors \
         nvme-cli \
         chrony \
@@ -322,7 +322,7 @@ main() {
     fetch_keys "$target"
 
     einfo "Installing base system"
-    $apk add --root "$target" --update-cache --initdb alpine-base
+    $apk add --root "$target" --no-cache --initdb alpine-base
 
     setup_chroot "$target"