From 9b189197c3f0f2cc6022eed33a0c135604114408 Mon Sep 17 00:00:00 2001
From: Alexey Lyubimov <a.lyubimov@softline.com>
Date: Tue, 18 Apr 2023 12:32:03 +0300
Subject: [PATCH] MSVSphere redebranding for 22.1-7.el9_1 update

---
 SOURCES/cloud-init-22.1-add_msvsphere.patch | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/SOURCES/cloud-init-22.1-add_msvsphere.patch b/SOURCES/cloud-init-22.1-add_msvsphere.patch
index f92ced7..601eddd 100644
--- a/SOURCES/cloud-init-22.1-add_msvsphere.patch
+++ b/SOURCES/cloud-init-22.1-add_msvsphere.patch
@@ -11,20 +11,19 @@ index 25bba76..aaf1228 100644
      "opensuse",
      "photon",
 diff --git a/cloudinit/config/cc_yum_add_repo.py b/cloudinit/config/cc_yum_add_repo.py
-index 7a23268..719d7ba 100644
+index 7a23268..58e938e 100644
 --- a/cloudinit/config/cc_yum_add_repo.py
 +++ b/cloudinit/config/cc_yum_add_repo.py
-@@ -19,7 +19,8 @@ entry, the config entry will be skipped.
+@@ -19,7 +19,7 @@ entry, the config entry will be skipped.
  **Module frequency:** always
  
  **Supported distros:** almalinux, centos, cloudlinux, eurolinux, fedora,
 -                       miraclelinux, openEuler, photon, rhel, rocky, virtuozzo
-+                       miraclelinux, msvsphere, openEuler, photon, rhel, rocky,
-+                       virtuozzo
++                       miraclelinux, msvsphere, openEuler, photon, rhel, rocky, virtuozzo
  
  **Config keys**::
  
-@@ -43,6 +44,7 @@ distros = [
+@@ -43,6 +43,7 @@ distros = [
      "cloudlinux",
      "eurolinux",
      "fedora",
@@ -45,7 +44,7 @@ index 76acd6a..798e428 100755
          "photon",
          "rhel",
 diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py
-index ba85c4f..1275bcb 100644
+index b50035b..b1e0045 100644
 --- a/cloudinit/net/sysconfig.py
 +++ b/cloudinit/net/sysconfig.py
 @@ -28,6 +28,7 @@ KNOWN_DISTROS = [
@@ -57,10 +56,10 @@ index ba85c4f..1275bcb 100644
      "rhel",
      "rocky",
 diff --git a/cloudinit/util.py b/cloudinit/util.py
-index 569fc21..1fffe39 100644
+index 4cb2155..36d901f 100644
 --- a/cloudinit/util.py
 +++ b/cloudinit/util.py
-@@ -584,6 +584,7 @@ def _get_variant(info):
+@@ -585,6 +585,7 @@ def _get_variant(info):
              "eurolinux",
              "fedora",
              "miraclelinux",
@@ -126,7 +125,7 @@ index 74d4742..0d39ed0 100644
  {% else %}
      local dsidentify="/usr/lib/cloud-init/ds-identify"
 diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
-index e71e567..fb88866 100644
+index fc984d5..4a453eb 100644
 --- a/systemd/cloud-init.service.tmpl
 +++ b/systemd/cloud-init.service.tmpl
 @@ -13,7 +13,7 @@ After=systemd-networkd-wait-online.service
@@ -137,9 +136,9 @@ index e71e567..fb88866 100644
 +                  "miraclelinux", "msvsphere", "openEuler", "rhel", "rocky", "virtuozzo"] %}
  After=network.service
  After=NetworkManager.service
- {% endif %}
+ After=NetworkManager-wait-online.service
 diff --git a/tools/render-cloudcfg b/tools/render-cloudcfg
-index 176df36..cd8ccf5 100755
+index afe999e..c727370 100755
 --- a/tools/render-cloudcfg
 +++ b/tools/render-cloudcfg
 @@ -22,6 +22,7 @@ def main():