Merge pull request #1131 from flatcar/scripts

Pull in flatcar/init and bootengine changes to ignore mana VF in networkd
flatcar · Sep 18, 2023 · 792a322 · 792a322
2 parents 31f6a6d + dc18330
commit 792a322
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-r180.ebuild → ...coreos-init/coreos-init-0.0.1-r181.ebuild b/...coreos-init/coreos-init-0.0.1-r180.ebuild → ...coreos-init/coreos-init-0.0.1-r181.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="5b3ef3ad0febec168137670b9243e8d220c90c7e" # flatcar-3602-backport
+	CROS_WORKON_COMMIT="5b0c6050c8f3e0daf940ca7000d5924a8f73052d" # flatcar-3602-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="a4ea304bcca3b00defba5011c26053716017eff4" # flatcar-3602-backport
+	CROS_WORKON_COMMIT="9e68a0cd0bbc92c68169ea544b6c5a720cb78e20" # flatcar-3602-backport
 	KEYWORDS="amd64 arm arm64 x86"
 fi
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- Add support for Microsoft Azure Network Adapter (MANA) NICs on Azure ([scripts#1131](https://github.com/flatcar/scripts/pull/1131))