From 1532d4739e181fe9063d0dc1c14124c18160bcf0 Mon Sep 17 00:00:00 2001 From: yixiangzhike Date: Wed, 6 Aug 2025 15:57:26 +0800 Subject: [PATCH] Correct unit filename in scripts --- cloud-init.spec | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/cloud-init.spec b/cloud-init.spec index 2293ae9..1d58d99 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,6 +1,6 @@ Name: cloud-init Version: 25.1 -Release: 3 +Release: 4 Summary: the defacto multi-distribution package that handles early initialization of a cloud instance. License: ASL 2.0 or GPLv3 URL: http://launchpad.net/cloud-init @@ -86,27 +86,28 @@ fi %pre %preun -%systemd_preun cloud-config.service cloud-config.target cloud-final.service cloud-init.service cloud-init.target cloud-init-local.service +%systemd_preun cloud-config.service cloud-config.target cloud-final.service cloud-init-main.service cloud-init.target cloud-init-local.service cloud-init-network.service %post if [ $1 -eq 1 ] ; then /bin/systemctl enable cloud-config.service >/dev/null 2>&1 || : /bin/systemctl enable cloud-final.service >/dev/null 2>&1 || : - /bin/systemctl enable cloud-init.service >/dev/null 2>&1 || : + /bin/systemctl enable cloud-init-network.service >/dev/null 2>&1 || : /bin/systemctl enable cloud-init-local.service >/dev/null 2>&1 || : elif [ $1 -eq 2 ]; then /bin/systemctl is-enabled cloud-config.service >/dev/null 2>&1 && /bin/systemctl reenable cloud-config.service >/dev/null 2>&1 || : /bin/systemctl is-enabled cloud-final.service >/dev/null 2>&1 && /bin/systemctl reenable cloud-final.service >/dev/null 2>&1 || : - /bin/systemctl is-enabled cloud-init.service >/dev/null 2>&1 && - /bin/systemctl reenable cloud-init.service >/dev/null 2>&1 || : + (/bin/systemctl is-enabled cloud-init-network.service >/dev/null 2>&1 || + /bin/systemctl is-enabled cloud-init.service >/dev/null 2>&1) && + /bin/systemctl reenable cloud-init-network.service >/dev/null 2>&1 || : /bin/systemctl is-enabled cloud-init-local.service >/dev/null 2>&1 && /bin/systemctl reenable cloud-init-local.service >/dev/null 2>&1 || : fi %postun -%systemd_postun cloud-config.service cloud-config.target cloud-final.service cloud-init.service cloud-init.target cloud-init-local.service +%systemd_postun cloud-config.service cloud-config.target cloud-final.service cloud-init-main.service cloud-init.target cloud-init-local.service cloud-init-network.service %files %doc ChangeLog @@ -145,6 +146,12 @@ fi %exclude /usr/share/doc/* %changelog +* Wed Aug 06 2025 yixiangzhike - 25.1-4 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:correct unit filename in scripts + * Mon Jul 07 2025 shixuantong - 25.1-3 - Type:CVE - CVE:CVE-2024-11584 -- Gitee