From e7b062a5c243b711069b03696915f607463395c6 Mon Sep 17 00:00:00 2001 From: Jon Maloy Date: Wed, 10 Dec 2025 06:36:02 -0500 Subject: [PATCH] * Wed Dec 10 2025 Jon Maloy - 24.4-8 - ci-downstream-Do-not-override-changes-in-disable-sshd-k.patch [RHEL-128876] - Resolves: RHEL-128876 ([rhel-9] cloud-init upgrade is overwriting modifications in disable-sshd-keygen-if-cloud-init-active.conf) --- cloud-init.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cloud-init.spec b/cloud-init.spec index d7ec486..70d9b95 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,6 +1,6 @@ Name: cloud-init Version: 24.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Cloud instance init scripts License: ASL 2.0 or GPLv3 URL: http://launchpad.net/cloud-init @@ -218,6 +218,7 @@ fi %doc %{_sysconfdir}/cloud/cloud.cfg.d/README %dir %{_sysconfdir}/cloud/templates %config(noreplace) %{_sysconfdir}/cloud/templates/* +%config(noreplace) %{_unitdir}/sshd-keygen@.service.d/disable-sshd-keygen-if-cloud-init-active.conf %{_unitdir}/cloud-config.service %{_unitdir}/cloud-config.target %{_unitdir}/cloud-final.service @@ -238,12 +239,16 @@ fi %{_datadir}/bash-completion/completions/cloud-init %{_bindir}/cloud-id %{_systemdgeneratordir}/cloud-init-generator -%{_unitdir}/sshd-keygen@.service.d/disable-sshd-keygen-if-cloud-init-active.conf %dir %{_sysconfdir}/rsyslog.d %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf %changelog +* Wed Dec 10 2025 Jon Maloy - 24.4-8 +- ci-downstream-Do-not-override-changes-in-disable-sshd-k.patch [RHEL-128876] +- Resolves: RHEL-128876 + ([rhel-9] cloud-init upgrade is overwriting modifications in disable-sshd-keygen-if-cloud-init-active.conf) + * Thu Jul 03 2025 Miroslav Rezanina - 24.4-7 - ci-fix-Don-t-attempt-to-identify-non-x86-OpenStack-inst.patch [RHEL-100615] - ci-fix-strict-disable-in-ds-identify-on-no-datasources-.patch [RHEL-100615]