From 356105f23d0dc8cc50e629624892b223f209de37 Mon Sep 17 00:00:00 2001 From: Jake Buchholz Date: Sun, 19 Aug 2018 07:31:44 -0700 Subject: [PATCH] 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 --- README.md | 2 +- make_ami.sh | 4 ++-- variables.json-default | 2 +- variables.json-example | 3 ++- 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. **Note:** This image will be updated as Alpine Linux changes over time and as AWS adds regions. This file and -[releases.yaml](https://github.com/mcrute/alpine-ec2-ami/blob/master/releases.yaml) +[release.yaml](https://github.com/mcrute/alpine-ec2-ami/blob/master/release.yaml) will be updated as new regions are made available. | 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() { # Disable starting getty for physical ttys because they're all inaccessible # anyhow. With this configuration boot messages will still display in the # EC2 console. - sed -Ei '/^tty\d/s/^/#/' /etc/inittab + sed -Ei '/^tty\d/s/^/#/' "$target"/etc/inittab # Make it a little more obvious who is logged in by adding username to the # prompt - sed -i "s/^export PS1='/&\\\\u@/" /etc/profile + sed -i "s/^export PS1='/&\\\\u@/" "$target"/etc/profile } create_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 @@ "ami_desc_suffix": " Release with EC2 Optimizations", "kernel_flavor": "vanilla@edge-main", "add_repos": "@edge-main http://dl-cdn.alpinelinux.org/alpine/edge/main,@edge-testing http://dl-cdn.alpinelinux.org/alpine/edge/testing", - "add_pkgs": "acct aws-ena-driver-vanilla@edge-testing", + "add_pkgs": "acct aws-ena-driver-vanilla@edge-testing e2fsprogs-extra", "ena_enable": "true", "sriov_enable": "false", "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 @@ # Space separated list of additional packages to add to the AMI. # acct - system accounting utilities (sa, etc.) # aws-ena-driver-vanilla - Enhanced Network Adapter kernel module - "add_pkgs": "acct aws-ena-driver-vanilla@edge-testing", + # e2fsprogs-extra - ec2-tiny-bootstrap's currently undeclared dependency (resize2fs) + "add_pkgs": "acct aws-ena-driver-vanilla@edge-testing e2fsprogs-extra", # Enable ENA/SRIOV support on the AMI. "ena_enable": "true",