From 8dacdbc12f018d8eb4a4a1be31a4b1943a61158a Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Mon, 17 Mar 2025 16:31:19 +0300
Subject: [PATCH] Add AlmaLinux OS and CloudLinux OS support to:

Modules:
- cc_resolv_conf

Datasources:
- Rbx Cloud Datasource
---
 cloudinit/config/cc_resolv_conf.py      | 2 ++
 cloudinit/settings.py                   | 2 +-
 cloudinit/sources/DataSourceRbxCloud.py | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cloudinit/config/cc_resolv_conf.py b/cloudinit/config/cc_resolv_conf.py
index 920c539..d506b2e 100644
--- a/cloudinit/config/cc_resolv_conf.py
+++ b/cloudinit/config/cc_resolv_conf.py
@@ -26,6 +26,8 @@ RESOLVE_CONFIG_TEMPLATE_MAP = {
 meta: MetaSchema = {
     "id": "cc_resolv_conf",
     "distros": [
+        "almalinux",
+        "cloudlinux",
         "alpine",
         "azurelinux",
         "fedora",
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
index ea7ac28..06c9c97 100644
--- a/cloudinit/settings.py
+++ b/cloudinit/settings.py
@@ -64,7 +64,7 @@ CFG_BUILTIN = {
             "docs_dir": "/usr/share/doc/cloud-init/",
             "templates_dir": "/etc/cloud/templates/",
         },
-        "distro": "rhel",
+        "distro": "almalinux",
         "network": {"renderers": None},
     },
     "vendor_data": {"enabled": True, "prefix": []},
diff --git a/cloudinit/sources/DataSourceRbxCloud.py b/cloudinit/sources/DataSourceRbxCloud.py
index 2fba114..1b1b667 100644
--- a/cloudinit/sources/DataSourceRbxCloud.py
+++ b/cloudinit/sources/DataSourceRbxCloud.py
@@ -60,7 +60,7 @@ def _sub_arp(cmd):
 
 def gratuitous_arp(items, distro):
     source_param = "-S"
-    if distro.name in ["fedora", "centos", "rhel"]:
+    if distro.name in ["almalinux", "fedora", "centos", "cloudlinux", "rhel"]:
         source_param = "-s"
     for item in items:
         try:
-- 
2.39.5 (Apple Git-154)