From 72b4f3b2dbd7eed4c0ebe02772cdbc60f90eb9f9 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 29 Jun 2015 11:31:34 -0700 Subject: [PATCH] ec2: disable new-style interface naming on Amazon Before we can enable ixgbevf devices by default we need to prevent the interface names from changing names and surprising folks. On the down side this may surprise anyone manually enabling ixgbevf on their instances but I expect that to be the smaller population. --- .../coreos-base/oem-ec2-compat/files/grub-ec2.cfg | 3 ++- ...2-compat-0.0.3-r2.ebuild => oem-ec2-compat-0.0.3-r3.ebuild} | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/{oem-ec2-compat-0.0.3-r2.ebuild => oem-ec2-compat-0.0.3-r3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg index aebcc16329..d1d06adf15 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/files/grub-ec2.cfg @@ -1,4 +1,5 @@ # CoreOS GRUB settings for EC2 # Blacklist the Xen framebuffer module so it doesn't get loaded at boot -set linux_append="modprobe.blacklist=xen_fbfront" +# Disable `ens3` style names, so eth0 is used for both ixgbevf or xen. +set linux_append="modprobe.blacklist=xen_fbfront net.ifnames=0" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-ec2-compat/oem-ec2-compat-0.0.3-r3.ebuild