From 3b42b061f0158d16b8fdbca55db044c9eb29a158 Mon Sep 17 00:00:00 2001 From: Marga Manterola Date: Thu, 9 Apr 2020 13:28:05 +0200 Subject: [PATCH] app-admin/flannel-wrapper: Create a 50-flannel.link When setting up flannel interfaces, use MACAddressPolicy=none, so that the MAC Address used is the initial one set by the kernel and not the one assigned by systemd. See coreos/flannel#1155 for more information. In #279 we tried adding the MACAddressPolicy=none setting to the existing 50-flannel.network file. But the change should have been in a .link file, not a .network file. --- .../app-admin/flannel-wrapper/files/50-flannel.link | 5 +++++ .../app-admin/flannel-wrapper/files/50-flannel.network | 1 - .../app-admin/flannel-wrapper/flannel-wrapper-0.11.0.ebuild | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/50-flannel.link diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/50-flannel.link b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/50-flannel.link new file mode 100644 index 0000000000..202aea5ba0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/50-flannel.link @@ -0,0 +1,5 @@ +[Match] +OriginalName=flannel* + +[Link] +MACAddressPolicy=none diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/50-flannel.network b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/50-flannel.network index b5fa458e36..e5d48d739b 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/50-flannel.network +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/files/50-flannel.network @@ -3,4 +3,3 @@ Name=flannel* [Link] Unmanaged=yes -MACAddressPolicy=none diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.11.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.11.0.ebuild index 9e9a8bc4fa..d9d3adb65c 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.11.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel-wrapper/flannel-wrapper-0.11.0.ebuild @@ -41,4 +41,5 @@ src_install() { insinto /usr/lib/systemd/network doins "${FILESDIR}"/50-flannel.network + doins "${FILESDIR}"/50-flannel.link }