Author: cperciva
Date: Thu Jul  6 22:34:54 2017
New Revision: 320759
URL: https://svnweb.freebsd.org/changeset/base/320759

Log:
  MFC r318894: Enable Amazon's "Elastic Network Adapter" in EC2 AMIs.

Modified:
  stable/11/release/Makefile.ec2
  stable/11/release/tools/ec2.conf
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/release/Makefile.ec2
==============================================================================
--- stable/11/release/Makefile.ec2      Thu Jul  6 22:34:34 2017        
(r320758)
+++ stable/11/release/Makefile.ec2      Thu Jul  6 22:34:54 2017        
(r320759)
@@ -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: stable/11/release/tools/ec2.conf
==============================================================================
--- stable/11/release/tools/ec2.conf    Thu Jul  6 22:34:34 2017        
(r320758)
+++ stable/11/release/tools/ec2.conf    Thu Jul  6 22:34:54 2017        
(r320759)
@@ -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)
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to