aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJake Buchholz <tomalok@gmail.com>2018-08-19 07:31:44 -0700
committerMike Crute <mike@crute.us>2018-08-28 09:20:48 -0700
commit356105f23d0dc8cc50e629624892b223f209de37 (patch)
treeb2b2ce35e548df5cdd42288ff3fc8d3c3b8540fe
parentcb95f7fd1eed7be5acbd386a95b0ba17823c6624 (diff)
downloadalpine-ec2-ami-356105f23d0dc8cc50e629624892b223f209de37.tar.bz2
alpine-ec2-ami-356105f23d0dc8cc50e629624892b223f209de37.tar.xz
alpine-ec2-ami-356105f23d0dc8cc50e629624892b223f209de37.zip
incorporate additional fixes
https://github.com/mcrute/alpine-ec2-ami/pull/8 - temporary fix until ec2-tiny-bootstrap deps are updated https://github.com/mcrute/alpine-ec2-ami/pull/9 https://github.com/mcrute/alpine-ec2-ami/pull/10
-rw-r--r--README.md2
-rwxr-xr-xmake_ami.sh4
-rw-r--r--variables.json-default2
-rw-r--r--variables.json-example3
4 files changed, 6 insertions, 5 deletions
diff --git a/README.md b/README.md
index 0248607..462899c 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ script is provided it will be executed as root after the network is configured.
20 20
21**Note:** This image will be updated as Alpine Linux changes over time and as 21**Note:** This image will be updated as Alpine Linux changes over time and as
22AWS adds regions. This file and 22AWS adds regions. This file and
23[releases.yaml](https://github.com/mcrute/alpine-ec2-ami/blob/master/releases.yaml) 23[release.yaml](https://github.com/mcrute/alpine-ec2-ami/blob/master/release.yaml)
24will be updated as new regions are made available. 24will be updated as new regions are made available.
25 25
26| Alpine Version | Region Code | AMI ID | 26| Alpine Version | Region Code | AMI ID |
diff --git a/make_ami.sh b/make_ami.sh
index 1e5a0b3..2917445 100755
--- a/make_ami.sh
+++ b/make_ami.sh
@@ -132,11 +132,11 @@ install_core_packages() {
132 # Disable starting getty for physical ttys because they're all inaccessible 132 # Disable starting getty for physical ttys because they're all inaccessible
133 # anyhow. With this configuration boot messages will still display in the 133 # anyhow. With this configuration boot messages will still display in the
134 # EC2 console. 134 # EC2 console.
135 sed -Ei '/^tty\d/s/^/#/' /etc/inittab 135 sed -Ei '/^tty\d/s/^/#/' "$target"/etc/inittab
136 136
137 # Make it a little more obvious who is logged in by adding username to the 137 # Make it a little more obvious who is logged in by adding username to the
138 # prompt 138 # prompt
139 sed -i "s/^export PS1='/&\\\\u@/" /etc/profile 139 sed -i "s/^export PS1='/&\\\\u@/" "$target"/etc/profile
140} 140}
141 141
142create_initfs() { 142create_initfs() {
diff --git a/variables.json-default b/variables.json-default
index a1f3ce0..c82e111 100644
--- a/variables.json-default
+++ b/variables.json-default
@@ -6,7 +6,7 @@
6 "ami_desc_suffix": " Release with EC2 Optimizations", 6 "ami_desc_suffix": " Release with EC2 Optimizations",
7 "kernel_flavor": "vanilla@edge-main", 7 "kernel_flavor": "vanilla@edge-main",
8 "add_repos": "@edge-main http://dl-cdn.alpinelinux.org/alpine/edge/main,@edge-testing http://dl-cdn.alpinelinux.org/alpine/edge/testing", 8 "add_repos": "@edge-main http://dl-cdn.alpinelinux.org/alpine/edge/main,@edge-testing http://dl-cdn.alpinelinux.org/alpine/edge/testing",
9 "add_pkgs": "acct aws-ena-driver-vanilla@edge-testing", 9 "add_pkgs": "acct aws-ena-driver-vanilla@edge-testing e2fsprogs-extra",
10 "ena_enable": "true", 10 "ena_enable": "true",
11 "sriov_enable": "false", 11 "sriov_enable": "false",
12 "volume_size": "1", 12 "volume_size": "1",
diff --git a/variables.json-example b/variables.json-example
index 4660c1d..c422de5 100644
--- a/variables.json-example
+++ b/variables.json-example
@@ -28,7 +28,8 @@
28 # Space separated list of additional packages to add to the AMI. 28 # Space separated list of additional packages to add to the AMI.
29 # acct - system accounting utilities (sa, etc.) 29 # acct - system accounting utilities (sa, etc.)
30 # aws-ena-driver-vanilla - Enhanced Network Adapter kernel module 30 # aws-ena-driver-vanilla - Enhanced Network Adapter kernel module
31 "add_pkgs": "acct aws-ena-driver-vanilla@edge-testing", 31 # e2fsprogs-extra - ec2-tiny-bootstrap's currently undeclared dependency (resize2fs)
32 "add_pkgs": "acct aws-ena-driver-vanilla@edge-testing e2fsprogs-extra",
32 33
33 # Enable ENA/SRIOV support on the AMI. 34 # Enable ENA/SRIOV support on the AMI.
34 "ena_enable": "true", 35 "ena_enable": "true",