From ca0ef845402c61fb1cad72d290e5182df3676148 Mon Sep 17 00:00:00 2001 From: RH Virt Maint Bot <8309305-rh-virt-maint-bot@users.noreply.gitlab.com> Date: Thu, 17 Aug 2023 09:28:17 +0000 Subject: [PATCH] * Thu Aug 17 2023 Miroslav Rezanina - 23.1.1-11 - Resolves: bz#2232296 --- cloud-init.spec | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/cloud-init.spec b/cloud-init.spec index 856e7a9..1a9c25d 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,6 +1,6 @@ Name: cloud-init Version: 23.1.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Cloud instance init scripts License: ASL 2.0 or GPLv3 URL: http://launchpad.net/cloud-init @@ -208,9 +208,18 @@ fi %postun %systemd_postun cloud-config.service cloud-config.target cloud-final.service cloud-init.service cloud-init.target cloud-init-local.service -rm -f "/etc/ssh/sshd_config.d/50-cloud-init.conf" -# clean config files generated by cloud-init -rm -Rf "/etc/NetworkManager/conf.d/*" + +if [ -f /etc/ssh/sshd_config.d/50-cloud-init.conf ] ; then + echo "/etc/ssh/sshd_config.d/50-cloud-init.conf not removed" +fi + +if [ -f /etc/NetworkManager/conf.d/99-cloud-init.conf ] ; then + echo "/etc/NetworkManager/conf.d/99-cloud-init.conf not removed" +fi + +if [ -f /etc/NetworkManager/conf.d/30-cloud-init-ip6-addr-gen-mode.conf ] ; then + echo "/etc/NetworkManager/conf.d/30-cloud-init-ip6-addr-gen-mode.conf not removed" +fi %files %license LICENSE @@ -249,7 +258,10 @@ rm -Rf "/etc/NetworkManager/conf.d/*" %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf %changelog -* Tue Aug 15 2023 Miroslav Rezanina - 23.1.1-10 +* Thu Aug 17 2023 Miroslav Rezanina - 23.1.1-11 +- Resolves: bz#2232296 + +* Tue Aug 15 2023 Miroslav Rezanina <6499514-mrezanin@users.noreply.gitlab.com> - 23.1.1-10 - Resolves: bz#2229660 bz#2229952 * Fri Aug 04 2023 Camilla Conte - 23.1.1-9