diff options
| author | cperciva <cperciva@FreeBSD.org> | 2017-07-06 22:34:54 +0000 |
|---|---|---|
| committer | cperciva <cperciva@FreeBSD.org> | 2017-07-06 22:34:54 +0000 |
| commit | b388b921ceb9441c448fcf729e97baf7987b79e1 (patch) | |
| tree | 55f16a9a79d9611c0627f8422a85b256b9af18e2 /release | |
| parent | 5964b8d169737b73fccad1ce2fe8cf0279cf621d (diff) | |
| download | FreeBSD-src-b388b921ceb9441c448fcf729e97baf7987b79e1.zip FreeBSD-src-b388b921ceb9441c448fcf729e97baf7987b79e1.tar.gz | |
MFC r318894: Enable Amazon's "Elastic Network Adapter" in EC2 AMIs.
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile.ec2 | 2 | ||||
| -rw-r--r-- | release/tools/ec2.conf | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index 45a08e4..b413ea5 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 4581788..4a7a1e8 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) |
