From 26f71b94591e62fd01157da14c044133bbb7c18f Mon Sep 17 00:00:00 2001 From: Tadas Sutkaitis Date: Wed, 3 Sep 2025 15:30:44 +0300 Subject: [PATCH] feat: introduce new cloud-init service names. Script logic inspired by: https://github.com/openstack/diskimage-builder/commit/93442d09cff0eadfc18b17793c24789dac094600 Change-Id: I01da9e9ac514a77a4131eae8f9a3ecb28460ef84 Signed-off-by: Tadas Sutkaitis --- .../cloud-init/post-install.d/20-enable-cloud-init | 7 ++++++- .../notes/cloud-init-service-name-2b56b8c7f1adb78c.yaml | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/cloud-init-service-name-2b56b8c7f1adb78c.yaml diff --git a/diskimage_builder/elements/cloud-init/post-install.d/20-enable-cloud-init b/diskimage_builder/elements/cloud-init/post-install.d/20-enable-cloud-init index 2de12a395..f943b880b 100755 --- a/diskimage_builder/elements/cloud-init/post-install.d/20-enable-cloud-init +++ b/diskimage_builder/elements/cloud-init/post-install.d/20-enable-cloud-init @@ -18,5 +18,10 @@ if [[ "${DIB_INIT_SYSTEM}" == "systemd" ]]; then systemctl enable cloud-config.service systemctl enable cloud-final.service systemctl enable cloud-init-local.service - systemctl enable cloud-init.service + if ! [[ $DIB_RELEASE =~ ^(testing|trixie|unstable) ]]; then + systemctl enable cloud-init.service + else + systemctl enable cloud-init-main.service + systemctl enable cloud-init-network.service + fi fi diff --git a/releasenotes/notes/cloud-init-service-name-2b56b8c7f1adb78c.yaml b/releasenotes/notes/cloud-init-service-name-2b56b8c7f1adb78c.yaml new file mode 100644 index 000000000..af16c984c --- /dev/null +++ b/releasenotes/notes/cloud-init-service-name-2b56b8c7f1adb78c.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Starting from 'cloud-init' version '24.3' service 'cloud-init.service' + is splitted in to 'cloud-init-network.service' and 'cloud-init-main.service'. + But some distributions are reverted to old service name.