From 5077c8721708cd2052d3bc1ec93451ae48f443965581ad273cb3e5b4cf8dd5a2 Mon Sep 17 00:00:00 2001
From: Robert Schweikert <rjschwei@suse.com>
Date: Wed, 1 Feb 2023 20:04:16 +0000
Subject: [PATCH] - Add cloud-init-prefer-nm.patch   + Prefer NetworkManager of
 sysconfig when available

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=198
---
 cloud-init-prefer-nm.patch | 15 +++++++++++++++
 cloud-init.changes         |  6 ++++++
 cloud-init.spec            |  3 +++
 3 files changed, 24 insertions(+)
 create mode 100644 cloud-init-prefer-nm.patch

diff --git a/cloud-init-prefer-nm.patch b/cloud-init-prefer-nm.patch
new file mode 100644
index 0000000..ee589f1
--- /dev/null
+++ b/cloud-init-prefer-nm.patch
@@ -0,0 +1,15 @@
+--- cloudinit/net/renderers.py.orig
++++ cloudinit/net/renderers.py
+@@ -27,10 +27,10 @@ NAME_TO_RENDERER = {
+ }
+ 
+ DEFAULT_PRIORITY = [
+-    "eni",
+-    "sysconfig",
+     "netplan",
+     "network-manager",
++    "eni",
++    "sysconfig",
+     "freebsd",
+     "netbsd",
+     "openbsd",
diff --git a/cloud-init.changes b/cloud-init.changes
index 2823181..6586d63 100644
--- a/cloud-init.changes
+++ b/cloud-init.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jan 31 19:47:23 UTC 2023 - Robert Schweikert <rjschwei@suse.com>
+
+- Add cloud-init-prefer-nm.patch
+  + Prefer NetworkManager of sysconfig when available
+
 -------------------------------------------------------------------
 Thu Dec 22 18:10:45 UTC 2022 - Robert Schweikert <rjschwei@suse.com>
 
diff --git a/cloud-init.spec b/cloud-init.spec
index 0f1e3df..83a8030 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -41,6 +41,8 @@ Patch6:        cloud-init-btrfs-queue-resize.patch
 Patch7:        cloud-init-micro-is-suse.patch
 # FIXME https://github.com/canonical/cloud-init/pull/1983
 Patch8:        cloud-init-suse-afternm.patch
+# FIXME: https://github.com/canonical/cloud-init/pull/1435
+Patch9:        cloud-init-prefer-nm.patch
 BuildRequires:  fdupes
 BuildRequires:  filesystem
 # pkg-config is needed to find correct systemd unit dir
@@ -149,6 +151,7 @@ Documentation and examples for cloud-init tools
 %patch6
 %patch7
 %patch8
+%patch9
 
 
 # patch in the full version to version.py