From 434f8bbd8a3f0e2e28cb4b2f495978d7969cee17 Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere.ru>
Date: Fri, 4 Aug 2023 19:53:59 +0300
Subject: [PATCH] import cloud-init-22.1-10.el9_2

---
 SPECS/cloud-init.spec | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec
index 3078090..3bbfcb5 100644
--- a/SPECS/cloud-init.spec
+++ b/SPECS/cloud-init.spec
@@ -1,6 +1,6 @@
 Name:           cloud-init
 Version:        22.1
-Release:        9%{?dist}
+Release:        10.el9_2
 Summary:        Cloud instance init scripts
 License:        ASL 2.0 or GPLv3
 URL:            http://launchpad.net/cloud-init
@@ -175,7 +175,27 @@ if [ $1 -eq 1 ] ; then
     /bin/systemctl enable cloud-init-local.service >/dev/null 2>&1 || :
     /bin/systemctl enable cloud-init.target        >/dev/null 2>&1 || :
 elif [ $1 -eq 2 ]; then
-    # Upgrade. If the upgrade is from a version older than 0.7.9-8,
+    # Upgrade
+    # RHBZ 2210012 - check for null ssh_genkeytypes value in cloud.cfg that
+    # breaks ssh connectivity after upgrade to a newer version of cloud-init.
+    if [ -f  %{_sysconfdir}/cloud/cloud.cfg.rpmnew ] && grep -q '^\s*ssh_genkeytypes:\s*~\s*$'  %{_sysconfdir}/cloud/cloud.cfg ; then
+       echo "***********************************************"
+       echo "*** WARNING!!!! ***"
+       echo ""
+       echo "ssh_genkeytypes set to null in /etc/cloud/cloud.cfg!"
+       echo "SSH access might be broken after reboot. Please check the following KCS"
+       echo "for more detailed information:"
+       echo ""
+       echo "https://access.redhat.com/solutions/6988034"
+       echo ""
+       echo "Please reconcile the differences between /etc/cloud/cloud.cfg and "
+       echo "/etc/cloud/cloud.cfg.rpmnew and update ssh_genkeytypes configuration in "
+       echo "/etc/cloud/cloud.cfg to a list of keytype values, something like:"
+       echo "ssh_genkeytypes:  ['rsa', 'ecdsa', 'ed25519']"
+       echo ""
+       echo "************************************************"
+    fi
+    # If the upgrade is from a version older than 0.7.9-8,
     # there will be stale systemd config
     /bin/systemctl is-enabled cloud-config.service >/dev/null 2>&1 &&
       /bin/systemctl reenable cloud-config.service >/dev/null 2>&1 || :
@@ -244,6 +264,9 @@ fi
 %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
 %changelog
+* Tue Jun 27 2023 Camilla Conte <cconte@redhat.com> - 22.1-10.el9_2
+- Resolves: bz#2217065
+
 * Wed Feb 08 2023 Camilla Conte <cconte@redhat.com> - 22.1-9
 - ci-Allow-growpart-to-resize-encrypted-partitions-1316.patch [bz#2166245]
 - Resolves: bz#2166245