Merge pull request #1131 from flatcar/scripts

Pull in flatcar/init and bootengine changes  to ignore mana VF in networkd
This commit is contained in:
Jeremi Piotrowski 2023-09-18 11:04:32 +02:00
commit 00243f908e
5 changed files with 3 additions and 2 deletions

View File

@ -0,0 +1 @@
- Add support for Microsoft Azure Network Adapter (MANA) NICs on Azure ([scripts#1131](https://github.com/flatcar/scripts/pull/1131))

View File

@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com"
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else
CROS_WORKON_COMMIT="80e4a9fa63fc1dc21cb2c76dd63842de93a6f031" # flatcar-3033-backport
CROS_WORKON_COMMIT="0566d05c8525a180a69c33c2e30f9efa8536c4b5" # flatcar-3033-backport
KEYWORDS="amd64 arm arm64 x86"
fi

View File

@ -10,7 +10,7 @@ CROS_WORKON_REPO="https://github.com"
if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
else
CROS_WORKON_COMMIT="184ab1234f8e1fa3366d1ca7f2caec7d9043f098" # tip of backports-flatcar-3033
CROS_WORKON_COMMIT="a4a383a7b81975d62c5502aeaf8c41c202093c73" # tip of backports-flatcar-3033
KEYWORDS="amd64 arm arm64 x86"
fi