Move AWS-Related configs to aws.conf

Resolves #131

configs/cloud/aws.conf

@@ -3,8 +3,17 @@ builder = qemu
 
 ntp_server  = 169.254.169.123
 
-kernel_modules.ena  = true
-initfs_features.ena = true
+kernel_modules {
+  ena   = true
+  nvme  = true
+}
+kernel_options {
+  "nvme_core.io_timeout=4294967295" = true
+}
+initfs_features {
+  ena   = true
+  nvme  = true
+}
 
 access.PUBLIC = true
 regions.ALL   = true

configs/version/base/1.conf

@@ -11,8 +11,6 @@ packages {
   linux-virt      = true
   alpine-mirrors  = true
   chrony          = true
-  iproute2        = true
-  nvme-cli        = true
   openssh         = true
   sudo            = true
   tzdata          = true
@@ -51,14 +49,11 @@ kernel_modules {
   sd-mod      = true
   usb-storage = true
   ext4        = true
-  nvme        = true
 }
 
 kernel_options {
-  "console=ttyS0,115200n8"          = true
-  "nvme_core.io_timeout=4294967295" = true
+  "console=ttyS0,115200n8" = true
 }
 
 initfs_features {
-  nvme  = true
 }

configs/version/base/2.conf

@@ -5,8 +5,4 @@ include required("1.conf")
 packages {
   # drop old alpine-mirrors
   alpine-mirrors    = null
-
-  # use iproute2-minimal instead of full iproute2
-  iproute2          = null
-  iproute2-minimal  = true
 }