From e58bb70bc581140bf83af42cef249a9aca6c547a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Tue, 25 Feb 2020 16:38:50 +0100 Subject: [PATCH] sys-kernel/bootengine: Re-enable persistent ifnames In the initramfs persistent ifnames were disabled. This caused problems because when the renaming was done after the initramfs, a race made it fail, as originally reported in https://github.com/coreos/bugs/issues/1767 Reverts the booteninge commit "systemd: add module to disable network device renaming" and widens the networkd match rule for DigitalOcean. --- ...{bootengine-0.0.38-r2.ebuild => bootengine-0.0.38-r3.ebuild} | 0 .../coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/{bootengine-0.0.38-r2.ebuild => bootengine-0.0.38-r3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-0.0.38-r3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild index 6686047f4f..421d9de351 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="4ddaee191d6ee6f8c52fca1d48225c5c57d753d2" # flatcar-master + CROS_WORKON_COMMIT="94b8192c8f1c290a3dcf56f241be86d7c54d2ed5" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi