From 39323377ed3b7819ae5c93df1e0f6f2cd0a1eebc Mon Sep 17 00:00:00 2001
From: Andrew Lukoshko <alukoshko@almalinux.org>
Date: Thu, 13 Mar 2025 14:35:38 +0000
Subject: [PATCH] Update AlmaLinux patch to fix issue with disabling cloud-init
 service [albz#500]

---
 ...s-for-AlmaLinux-OS-and-CloudLinux-OS.patch | 31 ++++++++++++-------
 SPECS/cloud-init.spec                         |  5 ++-
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/SOURCES/0001-Improvements-for-AlmaLinux-OS-and-CloudLinux-OS.patch b/SOURCES/0001-Improvements-for-AlmaLinux-OS-and-CloudLinux-OS.patch
index 1b3e71b..a9d1e46 100644
--- a/SOURCES/0001-Improvements-for-AlmaLinux-OS-and-CloudLinux-OS.patch
+++ b/SOURCES/0001-Improvements-for-AlmaLinux-OS-and-CloudLinux-OS.patch
@@ -1,6 +1,6 @@
-From f4f100c0dddf1f11b239374a8dc452739b8e6a81 Mon Sep 17 00:00:00 2001
+From 6701ba45d4cc3a888f2275f8f840ce37bc2f4959 Mon Sep 17 00:00:00 2001
 From: Andrew Lukoshko <alukoshko@almalinux.org>
-Date: Thu, 28 Mar 2024 14:24:08 +0000
+Date: Thu, 13 Mar 2025 14:24:23 +0000
 Subject: [PATCH] Improvements for AlmaLinux OS and CloudLinux OS
 
 Add AlmaLinux OS and CloudLinux OS support to:
@@ -25,12 +25,12 @@ Systemd services:
  cloudinit/sources/DataSourceRbxCloud.py |  2 +-
  systemd/cloud-final.service.tmpl        |  2 +-
  systemd/cloud-init-local.service.tmpl   | 10 ++--
- systemd/cloud-init.service.tmpl         |  2 +-
+ systemd/cloud-init.service.tmpl         |  4 +-
  templates/chrony.conf.almalinux.tmpl    | 51 ++++++++++++++++++++
  templates/chrony.conf.cloudlinux.tmpl   | 51 ++++++++++++++++++++
  templates/ntp.conf.almalinux.tmpl       | 64 +++++++++++++++++++++++++
  templates/ntp.conf.cloudlinux.tmpl      | 64 +++++++++++++++++++++++++
- 12 files changed, 252 insertions(+), 17 deletions(-)
+ 12 files changed, 253 insertions(+), 18 deletions(-)
  create mode 100644 templates/chrony.conf.almalinux.tmpl
  create mode 100644 templates/chrony.conf.cloudlinux.tmpl
  create mode 100644 templates/ntp.conf.almalinux.tmpl
@@ -106,7 +106,7 @@ index aa88919..4eb1d76 100644
          "mariner",
          "opensuse",
 diff --git a/cloudinit/settings.py b/cloudinit/settings.py
-index 5ced21b..51cb115 100644
+index 3a581e5..def6d4b 100644
 --- a/cloudinit/settings.py
 +++ b/cloudinit/settings.py
 @@ -61,7 +61,7 @@ CFG_BUILTIN = {
@@ -132,10 +132,10 @@ index 9214f1b..14880ec 100644
      for item in items:
          try:
 diff --git a/systemd/cloud-final.service.tmpl b/systemd/cloud-final.service.tmpl
-index bcf8b00..6d34761 100644
+index 85f423a..4faef66 100644
 --- a/systemd/cloud-final.service.tmpl
 +++ b/systemd/cloud-final.service.tmpl
-@@ -18,7 +18,7 @@ ExecStart=/usr/bin/cloud-init modules --mode=final
+@@ -19,7 +19,7 @@ ExecStart=/usr/bin/cloud-init modules --mode=final
  RemainAfterExit=yes
  TimeoutSec=0
  KillMode=process
@@ -145,7 +145,7 @@ index bcf8b00..6d34761 100644
  ExecStartPost=/bin/sh -c 'u=NetworkManager.service; \
   out=$(systemctl show --property=SubState $u) || exit; \
 diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl
-index 3a1ca7f..853ae2c 100644
+index 6f3f9d8..493eaf1 100644
 --- a/systemd/cloud-init-local.service.tmpl
 +++ b/systemd/cloud-init-local.service.tmpl
 @@ -1,23 +1,23 @@
@@ -176,7 +176,7 @@ index 3a1ca7f..853ae2c 100644
  Before=firewalld.target
  Conflicts=shutdown.target
  {% endif %}
-@@ -32,7 +32,7 @@ ConditionEnvironment=!KERNEL_CMDLINE=cloud-init=disabled
+@@ -33,7 +33,7 @@ ConditionKernelCommandLine=!cloud-init=disabled
  
  [Service]
  Type=oneshot
@@ -186,7 +186,7 @@ index 3a1ca7f..853ae2c 100644
  ExecStartPre=/sbin/restorecon /run/cloud-init
  ExecStartPre=/usr/bin/touch /run/cloud-init/enabled
 diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
-index bf91164..1ae88f7 100644
+index 26d2e39..71f867e 100644
 --- a/systemd/cloud-init.service.tmpl
 +++ b/systemd/cloud-init.service.tmpl
 @@ -1,7 +1,7 @@
@@ -198,6 +198,15 @@ index bf91164..1ae88f7 100644
  DefaultDependencies=no
  {% endif %}
  Wants=cloud-init-local.service
+@@ -38,7 +38,7 @@ Conflicts=shutdown.target
+ Before=shutdown.target
+ Conflicts=shutdown.target
+ {% endif %}
+-{% if variant == "rhel" %}
++{% if variant in ["almalinux", "cloudlinux", "rhel"] %}
+ ConditionPathExists=!/etc/cloud/cloud-init.disabled
+ ConditionKernelCommandLine=!cloud-init=disabled
+ {% endif %}
 diff --git a/templates/chrony.conf.almalinux.tmpl b/templates/chrony.conf.almalinux.tmpl
 new file mode 100644
 index 0000000..43b1f5d
@@ -453,5 +462,5 @@ index 0000000..9884df5
 +# Enable writing of statistics records.
 +#statistics clockstats cryptostats loopstats peerstats
 -- 
-2.27.0
+2.43.5
 
diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec
index 40d5bb3..25dc8da 100644
--- a/SPECS/cloud-init.spec
+++ b/SPECS/cloud-init.spec
@@ -6,7 +6,7 @@
 
 Name:           cloud-init
 Version:        23.4
-Release:        7%{?dist}.8.alma.1
+Release:        7%{?dist}.8.alma.2
 Summary:        Cloud instance init scripts
 
 Group:          System Environment/Base
@@ -275,6 +275,9 @@ fi
 %config(noreplace) %{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
 %changelog
+* Thu Mar 13 2025 Andrew Lukoshko <alukoshko@almalinux.org> - 23.4-7.el8_10.8.alma.2
+- Update AlmaLinux patch to fix issue with disabling cloud-init service [albz#500]
+
 * Tue Sep 24 2024 Eduard Abdullin <eabdullin@almalinux.org> - 23.4-7.el8_10.8.alma.1
 - 0001-Improvements-for-AlmaLinux-OS-and-CloudLinux-OS.patch