* Mon Nov 01 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-12

- ci-remove-unnecessary-EOF-string-in-disable-sshd-keygen.patch [bz#2016305]
- Resolves: bz#2016305
  (disable-sshd-keygen-if-cloud-init-active.conf:8: Missing '=', ignoring line)

ci-remove-unnecessary-EOF-string-in-disable-sshd-keygen.patch

@@ -0,0 +1,45 @@
+From ec9c280ad24900ad078a0f371fa8b4f5f407ee90 Mon Sep 17 00:00:00 2001
+From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date: Tue, 26 Oct 2021 21:52:45 +0200
+Subject: [PATCH] remove unnecessary EOF string in
+ disable-sshd-keygen-if-cloud-init-active.conf (#1075)
+
+RH-Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+RH-MergeRequest: 13: remove unnecessary EOF string in disable-sshd-keygen-if-cloud-init-active.conf (#1075)
+RH-Commit: [1/1] 4c01a4bb86a73df3212bb4cf0388b2df707eddc4 (eesposit/cloud-init-centos-)
+RH-Bugzilla: 2016305
+RH-Acked-by: Eduardo Otubo <otubo@redhat.com>
+RH-Acked-by: Mohamed Gamal Morsy <mmorsy@redhat.com>
+
+commit a8380a125d40ff0ae88f2ba25a518346f2063a1a
+Author: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+Date:   Tue Oct 26 16:15:47 2021 +0200
+
+    remove unnecessary EOF string in disable-sshd-keygen-if-cloud-init-active.conf (#1075)
+
+    Running 'systemd-analyze verify cloud-init-local.service'
+    triggers the following warning:
+
+    disable-sshhd-keygen-if-cloud-init-active.conf:8: Missing '=', ignoring line.
+
+    The string "EOF" is probably a typo, so remove it.
+
+    Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+
+Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
+---
+ systemd/disable-sshd-keygen-if-cloud-init-active.conf | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/systemd/disable-sshd-keygen-if-cloud-init-active.conf b/systemd/disable-sshd-keygen-if-cloud-init-active.conf
+index 71e35876..1a5d7a5a 100644
+--- a/systemd/disable-sshd-keygen-if-cloud-init-active.conf
++++ b/systemd/disable-sshd-keygen-if-cloud-init-active.conf
+@@ -5,4 +5,3 @@
+ #
+ [Unit]
+ ConditionPathExists=!/run/systemd/generator.early/multi-user.target.wants/cloud-init.target
+-EOF
+-- 
+2.27.0
+

cloud-init.spec

@@ -1,6 +1,6 @@
 Name:           cloud-init
 Version:        21.1
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Cloud instance init scripts
 License:        ASL 2.0 or GPLv3
 URL:            http://launchpad.net/cloud-init
@@ -28,6 +28,8 @@ Patch10: ci-ssh_utils.py-ignore-when-sshd_config-options-are-not.patch
 Patch11: ci-Inhibit-sshd-keygen-.service-if-cloud-init-is-active.patch
 # For bz#2015974 - cloud-init fails to set host key permissions correctly
 Patch12: ci-cc_ssh.py-fix-private-key-group-owner-and-permission.patch
+# For bz#2016305 - disable-sshd-keygen-if-cloud-init-active.conf:8: Missing '=', ignoring line
+Patch13: ci-remove-unnecessary-EOF-string-in-disable-sshd-keygen.patch
 
 # Source-git patches
 
@@ -225,6 +227,11 @@ fi
 %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
 %changelog
+* Mon Nov 01 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-12
+- ci-remove-unnecessary-EOF-string-in-disable-sshd-keygen.patch [bz#2016305]
+- Resolves: bz#2016305
+  (disable-sshd-keygen-if-cloud-init-active.conf:8: Missing '=', ignoring line)
+
 * Tue Oct 26 2021 Miroslav Rezanina <mrezanin@redhat.com> - 21.1-11
 - ci-cc_ssh.py-fix-private-key-group-owner-and-permission.patch [bz#2015974]
 - Resolves: bz#2015974