Date: Thu, 25 May 2017 19:02:54 +0000 (UTC) From: Colin Percival <cperciva@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r318894 - in head/release: . tools Message-ID: <201705251902.v4PJ2s1q070760@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cperciva Date: Thu May 25 19:02:54 2017 New Revision: 318894 URL: https://svnweb.freebsd.org/changeset/base/318894 Log: Turn on support for the Amazon "Elastic Network Adapter" in EC2 AMIs. X-MFC-after: 318647 + fixes for some lock ordering warnings Modified: head/release/Makefile.ec2 head/release/tools/ec2.conf Modified: head/release/Makefile.ec2 ============================================================================== --- head/release/Makefile.ec2 Thu May 25 18:55:10 2017 (r318893) +++ head/release/Makefile.ec2 Thu May 25 19:02:54 2017 (r318894) @@ -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}" \ Modified: head/release/tools/ec2.conf ============================================================================== --- head/release/tools/ec2.conf Thu May 25 18:55:10 2017 (r318893) +++ head/release/tools/ec2.conf Thu May 25 19:02:54 2017 (r318894) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705251902.v4PJ2s1q070760>