aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2019-01-09 03:55:25 +0000
committerColin Percival <cperciva@FreeBSD.org>2019-01-09 03:55:25 +0000
commit8cb623ce6e9a54476da6caef6328599d9b898b22 (patch)
treedf2195a17b361ab61deb77e100aaa5253fab053b
parent26e3f9681b94dd397ed0c163636ac05c036db3ca (diff)
downloadsrc-8cb623ce6e9a54476da6caef6328599d9b898b22.tar.gz
src-8cb623ce6e9a54476da6caef6328599d9b898b22.zip
Turn off ec2_ephemeralswap for now
This script broke around FreeBSD 11.0 as a result of SWAPMETA no longer being reported by vmstat -z; but it also needs to be reworked due to the arrival in EC2 of nvme ephemeral disks. I'll turn this option back on after I've found time to rewrite the script in question. PR: 234686 Reported by: meta@ MFC after: 1 week
Notes
Notes: svn path=/head/; revision=342875
-rw-r--r--release/tools/ec2.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf
index 562647cd7024..c0164fc8c3f1 100644
--- a/release/tools/ec2.conf
+++ b/release/tools/ec2.conf
@@ -9,7 +9,7 @@
export VM_EXTRA_PACKAGES="ec2-scripts firstboot-freebsd-update firstboot-pkgs dual-dhclient amazon-ssm-agent"
# Set to a list of third-party software to enable in rc.conf(5).
-export VM_RC_LIST="ec2_configinit ec2_fetchkey ec2_ephemeralswap ec2_loghostkey firstboot_freebsd_update firstboot_pkgs ntpd"
+export VM_RC_LIST="ec2_configinit ec2_fetchkey ec2_loghostkey firstboot_freebsd_update firstboot_pkgs ntpd"
# Build with a 3 GB UFS partition; the growfs rc.d script will expand
# the partition to fill the root disk after the EC2 instance is launched.