Merge pull request #1131 from flatcar/scripts

Pull in flatcar/init and bootengine changes to ignore mana VF in networkd
flatcar · Sep 18, 2023 · a2b4f9b · a2b4f9b
2 parents c30cc59 + eb2477f
commit a2b4f9b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 2 deletions.
diff --git a/changelog/changes/2023-09-12-azure-mana-vf.md b/changelog/changes/2023-09-12-azure-mana-vf.md
@@ -0,0 +1 @@
+- Add support for Microsoft Azure Network Adapter (MANA) NICs on Azure ([scripts#1131](https://github.com/flatcar/scripts/pull/1131))
diff --git a/...coreos-init/coreos-init-0.0.1-r179.ebuild → ...coreos-init/coreos-init-0.0.1-r180.ebuild b/...coreos-init/coreos-init-0.0.1-r179.ebuild → ...coreos-init/coreos-init-0.0.1-r180.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild
@@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
-	CROS_WORKON_COMMIT="3e6270ca55dabaa8c00322753bf409c8453f97a4" # flatcar-3510-backport
+	CROS_WORKON_COMMIT="8edef94dd894beaccb1d44887cc0a68bae106a9f" # flatcar-3510-backport
 	KEYWORDS="amd64 arm arm64 x86"
 fi
 

diff --git a/...l/bootengine/bootengine-0.0.38-r13.ebuild → ...l/bootengine/bootengine-0.0.38-r14.ebuild b/...l/bootengine/bootengine-0.0.38-r13.ebuild → ...l/bootengine/bootengine-0.0.38-r14.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
@@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com"
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 else
-	CROS_WORKON_COMMIT="681c0791696968957dfb0d6d74558b69f4ace43e" # flatcar-3510-backport
+	CROS_WORKON_COMMIT="af7ac28107d0a960b09e0c63ae9dd343aa697c98" # flatcar-3510-backport
 	KEYWORDS="amd64 arm arm64 x86"
 fi