Merge pull request #1131 from flatcar/azure-mana-vf

Pull in flatcar/init and bootengine changes to ignore mana VF in networkd
flatcar · Sep 15, 2023 · bf21753 · bf21753
2 parents 9437eff + eb5db9b
commit bf21753
Show file tree

Hide file tree

Showing 4 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/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="2815942c231c6556356eea59a8c15d9685338a06" # flatcar-master
+	CROS_WORKON_COMMIT="53b0aa5d291d26f3a14c6f392ff20fdd5003a0f2" # flatcar-master
 	KEYWORDS="amd64 arm arm64 x86"
 fi
 

diff --git a/...l/bootengine/bootengine-0.0.38-r18.ebuild → ...l/bootengine/bootengine-0.0.38-r19.ebuild b/...l/bootengine/bootengine-0.0.38-r18.ebuild → ...l/bootengine/bootengine-0.0.38-r19.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="1066c7f5155f9846da3f83473be9c8768524b52c" # flatcar-master
+	CROS_WORKON_COMMIT="487ae88d11f034da5d81ea8517f637ac416735cf" # flatcar-master
 	KEYWORDS="amd64 arm arm64 x86"
 fi