From 0edcc5b8d53c75a727aed10c0ca7948a10bcba33 Mon Sep 17 00:00:00 2001 From: Colin Percival Date: Thu, 25 May 2017 19:02:54 +0000 Subject: [PATCH] Turn on support for the Amazon "Elastic Network Adapter" in EC2 AMIs. X-MFC-after: 318647 + fixes for some lock ordering warnings --- release/Makefile.ec2 | 2 +- release/tools/ec2.conf | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index 45a08e48729..b413ea5505f 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -51,7 +51,7 @@ ec2ami: cw-ec2 ${CW_EC2_PORTINSTALL} @echo "--------------------------------------------------------------" @false .endif - /usr/local/bin/bsdec2-image-upload ${PUBLISH} --sriov \ + /usr/local/bin/bsdec2-image-upload ${PUBLISH} --sriov --ena \ ${.OBJDIR}/ec2.raw \ "${TYPE} ${REVISION}-${BRANCH}-${TARGET}${AMINAMESUFFIX}" \ "${TYPE} ${REVISION}-${BRANCH}-${TARGET}" \ diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 4581788c753..4a7a1e809ec 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -78,6 +78,9 @@ vm_extra_pre_umount() { # nodes, but apply the workaround just in case. echo 'hw.broken_txfifo="1"' >> ${DESTDIR}/boot/loader.conf + # Load the kernel module for the Amazon "Elastic Network Adapter" + echo 'if_ena_load="YES"' >> ${DESTDIR}/boot/loader.conf + # The first time the AMI boots, the installed "first boot" scripts # should be allowed to run: # * ec2_configinit (download and process EC2 user-data)