project-lakitu: update cloud-init to v21.4

BUG=b/213607836
TEST=presubmit
RELEASE_NOTE=update cloud-init to 21.4

Change-Id: Ic60b15883db6367e439a5020a2323950a438e929
Reviewed-on: https://cos-review.googlesource.com/c/cos/overlays/board-overlays/+/27160
Reviewed-by: Robert Kolchmeyer <rkolchmeyer@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
diff --git a/project-lakitu/app-emulation/cloud-init/Manifest b/project-lakitu/app-emulation/cloud-init/Manifest
index 3fa6a10..295e6bb 100644
--- a/project-lakitu/app-emulation/cloud-init/Manifest
+++ b/project-lakitu/app-emulation/cloud-init/Manifest
@@ -1 +1 @@
-DIST cloud-init-21.2.tar.gz 1278878 BLAKE2B 74e07649a24fc85df54aafcd72797a05f0bdbcceb90fe90c6af7024da09e876780b67bb1d7963cd164d03e3151715944b1f3fd5709d3557ac341a09061409fcc SHA512 8cc24945efc6f16b3c64411c5e7e5b83582d337f1c3f546163d52c14a6177ff752e91ba1fec04b7ade800f921c2b79c04d032df62c2b4171930ca1fb74c49a7d
+DIST cloud-init-21.4.tar.gz 1293892 BLAKE2B 2b48f1766d2397f222f62a5af77b375846b753198be75d3f34693d379ed8599b2aee63505b7d00efae55f805cea1840e7b9ee3d35f089d2669c14c1c5f77a788 SHA512 d4814042ceaf767f85105aa510d25c75752220f9ad968b35520074366b932c2c09781ad3a63bba8046e53632b45a765bd9f22e3d53a10f4f3dd631f9dbc3cfda
diff --git a/project-lakitu/app-emulation/cloud-init/cloud-init-21.2-r3.ebuild b/project-lakitu/app-emulation/cloud-init/cloud-init-21.2-r3.ebuild
deleted file mode 120000
index 7e583fd..0000000
--- a/project-lakitu/app-emulation/cloud-init/cloud-init-21.2-r3.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-cloud-init-21.2.ebuild
\ No newline at end of file
diff --git a/project-lakitu/app-emulation/cloud-init/cloud-init-21.4-r1.ebuild b/project-lakitu/app-emulation/cloud-init/cloud-init-21.4-r1.ebuild
new file mode 120000
index 0000000..d2253a4
--- /dev/null
+++ b/project-lakitu/app-emulation/cloud-init/cloud-init-21.4-r1.ebuild
@@ -0,0 +1 @@
+cloud-init-21.4.ebuild
\ No newline at end of file
diff --git a/project-lakitu/app-emulation/cloud-init/cloud-init-21.2.ebuild b/project-lakitu/app-emulation/cloud-init/cloud-init-21.4.ebuild
similarity index 95%
rename from project-lakitu/app-emulation/cloud-init/cloud-init-21.2.ebuild
rename to project-lakitu/app-emulation/cloud-init/cloud-init-21.4.ebuild
index 444ee03..0b4db55 100644
--- a/project-lakitu/app-emulation/cloud-init/cloud-init-21.2.ebuild
+++ b/project-lakitu/app-emulation/cloud-init/cloud-init-21.4.ebuild
@@ -32,6 +32,7 @@
 	dev-python/jsonpatch[${PYTHON_USEDEP}]
 	dev-python/jsonschema[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -60,11 +61,6 @@
 	"${FILESDIR}"/18.4-fix-update_package_sources-function.patch
 	"${FILESDIR}"/18.4-add-support-for-package_upgrade.patch
 
-	# For lakitu
-	# Google Metadata Server
-	"${FILESDIR}/${PV}-datasource-gce-platform-google.patch"
-	"${FILESDIR}/${PV}-add-retries-gce-metadata-server.patch"
-
 	# Ensures the user added through cloud-init have UID in range [2000, 5000)
 	"${FILESDIR}/${PV}-stable-uid.patch"
 	"${FILESDIR}/${PV}-fix-cross-compile.patch"
@@ -72,7 +68,7 @@
 	"${FILESDIR}/${PV}-skip-root-ssh-keys.patch"
 
 	# Enable NTP for COS in cloud-init
-	"${FILESDIR}/21.2-enable-ntp-for-cos.patch"
+	"${FILESDIR}/${PV}-enable-ntp-for-cos.patch"
 	# Remove dhclient dependency from /tmp.
 	"${FILESDIR}/cloud-init-azure-remove-dhclient.patch"
 )
diff --git a/project-lakitu/app-emulation/cloud-init/files/21.2-add-retries-gce-metadata-server.patch b/project-lakitu/app-emulation/cloud-init/files/21.2-add-retries-gce-metadata-server.patch
deleted file mode 100644
index 2af5db0..0000000
--- a/project-lakitu/app-emulation/cloud-init/files/21.2-add-retries-gce-metadata-server.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From fdad94561b8acd25fc0d265642686fb2d9e0923d Mon Sep 17 00:00:00 2001
-From: Ke Wu <mikewu@google.com>
-Date: Fri, 12 Jan 2018 16:35:02 -0800
-Subject: [PATCH] Add retries to DataSourceGCE.py when connecting to GCE
- metadata server
-
-Signed-off-by: Wei Xu <weixugc@google.com>
----
- cloudinit/sources/DataSourceGCE.py | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/cloudinit/sources/DataSourceGCE.py b/cloudinit/sources/DataSourceGCE.py
-index 6cbfbbac..7fb43c09 100644
---- a/cloudinit/sources/DataSourceGCE.py
-+++ b/cloudinit/sources/DataSourceGCE.py
-@@ -28,6 +28,8 @@ class GoogleMetadataFetcher(object):
- 
-     def __init__(self, metadata_address):
-         self.metadata_address = metadata_address
-+        self.retries = 5
-+        self.retries_sec_between = 1
- 
-     def get_value(self, path, is_text, is_recursive=False):
-         value = None
-@@ -35,7 +37,10 @@ class GoogleMetadataFetcher(object):
-             url = self.metadata_address + path
-             if is_recursive:
-                 url += '/?recursive=True'
--            resp = url_helper.readurl(url=url, headers=HEADERS)
-+            resp = url_helper.readurl(url=url,
-+                                      headers=HEADERS,
-+                                      retries=self.retries,
-+                                      sec_between=self.retries_sec_between)
-         except url_helper.UrlError as exc:
-             msg = "url %s raised exception %s"
-             LOG.debug(msg, path, exc)
--- 
-2.25.1.481.gfbce0eb801-goog
-
diff --git a/project-lakitu/app-emulation/cloud-init/files/21.2-datasource-gce-platform-google.patch b/project-lakitu/app-emulation/cloud-init/files/21.2-datasource-gce-platform-google.patch
deleted file mode 100644
index 8217665..0000000
--- a/project-lakitu/app-emulation/cloud-init/files/21.2-datasource-gce-platform-google.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9752b2bfe5409d83d60743e3bb9fbc5765e4d15b Mon Sep 17 00:00:00 2001
-From: Wei Xu <weixugc@google.com>
-Date: Fri, 28 Feb 2020 11:12:12 -0800
-Subject: [PATCH] Add 'Google' to supported platform of DataSourceGCE.
-
-This adds "Google" as a supported platform of DataSourceGCE, in
-addition to "Google Compute Engine".
----
-diff --git a/cloudinit/sources/DataSourceGCE.py b/cloudinit/sources/DataSourceGCE.py
-index 746caddb..8588e679 100644
---- a/cloudinit/sources/DataSourceGCE.py
-+++ b/cloudinit/sources/DataSourceGCE.py
-@@ -250,7 +250,7 @@ def read_md(address=None, platform_check=True):
- 
- def platform_reports_gce():
-     pname = dmi.read_dmi_data('system-product-name') or "N/A"
--    if pname == "Google Compute Engine":
-+    if pname == "Google Compute Engine" or pname == "Google":
-         return True
- 
-     # system-product-name is not always guaranteed (LP: #1674861)
-
--- 
-2.25.1.481.gfbce0eb801-goog
-
diff --git a/project-lakitu/app-emulation/cloud-init/files/21.2-cloud-init-remove-sshd-and-network-service-dependencies.patch b/project-lakitu/app-emulation/cloud-init/files/21.4-cloud-init-remove-sshd-and-network-service-dependencies.patch
similarity index 91%
rename from project-lakitu/app-emulation/cloud-init/files/21.2-cloud-init-remove-sshd-and-network-service-dependencies.patch
rename to project-lakitu/app-emulation/cloud-init/files/21.4-cloud-init-remove-sshd-and-network-service-dependencies.patch
index bda7a3b..14fba6b 100644
--- a/project-lakitu/app-emulation/cloud-init/files/21.2-cloud-init-remove-sshd-and-network-service-dependencies.patch
+++ b/project-lakitu/app-emulation/cloud-init/files/21.4-cloud-init-remove-sshd-and-network-service-dependencies.patch
@@ -29,24 +29,23 @@
  {% if variant in ["ubuntu", "unknown", "debian"] %}
  Before=sysinit.target
 diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
-index f140344d..9aec6816 100644
+index de3f3d91..73fb7ed2 100644
 --- a/systemd/cloud-init.service.tmpl
 +++ b/systemd/cloud-init.service.tmpl
-@@ -2,11 +2,10 @@
- [Unit]
- Description=Initial cloud-init job (metadata service crawler)
+@@ -5,10 +5,9 @@ Description=Initial cloud-init job (metadata service crawler)
  DefaultDependencies=no
-+Requires=network-online.target
-+Wants=network-online.target
+ {% endif %}
  Wants=cloud-init-local.service
 -Wants=sshd-keygen.service
 -Wants=sshd.service
  After=cloud-init-local.service
 -After=systemd-networkd-wait-online.service
++Requires=network-online.target
++Wants=network-online.target
  {% if variant in ["ubuntu", "unknown", "debian"] %}
  After=networking.service
  {% endif %}
-@@ -20,9 +19,7 @@ After=wicked.service
+@@ -23,9 +22,7 @@ After=wicked.service
  # would not be guaranteed at this point.
  After=dbus.service
  {% endif %}
@@ -57,7 +56,7 @@
  {% if variant in ["ubuntu", "unknown", "debian"] %}
  Before=sysinit.target
  Before=shutdown.target
-@@ -32,7 +29,6 @@ Conflicts=shutdown.target
+@@ -35,7 +32,6 @@ Conflicts=shutdown.target
  Before=shutdown.target
  Conflicts=shutdown.target
  {% endif %}
@@ -65,7 +64,7 @@
  
  [Service]
  Type=oneshot
--- 
+---
 2.32.0.rc1.229.g3e70b5a671-goog
 
 
diff --git a/project-lakitu/app-emulation/cloud-init/files/21.2-enable-ntp-for-cos.patch b/project-lakitu/app-emulation/cloud-init/files/21.4-enable-ntp-for-cos.patch
similarity index 100%
rename from project-lakitu/app-emulation/cloud-init/files/21.2-enable-ntp-for-cos.patch
rename to project-lakitu/app-emulation/cloud-init/files/21.4-enable-ntp-for-cos.patch
diff --git a/project-lakitu/app-emulation/cloud-init/files/21.2-fix-cross-compile.patch b/project-lakitu/app-emulation/cloud-init/files/21.4-fix-cross-compile.patch
similarity index 100%
rename from project-lakitu/app-emulation/cloud-init/files/21.2-fix-cross-compile.patch
rename to project-lakitu/app-emulation/cloud-init/files/21.4-fix-cross-compile.patch
diff --git a/project-lakitu/app-emulation/cloud-init/files/21.2-remove-sshd-dependency.patch b/project-lakitu/app-emulation/cloud-init/files/21.4-remove-sshd-dependency.patch
similarity index 73%
rename from project-lakitu/app-emulation/cloud-init/files/21.2-remove-sshd-dependency.patch
rename to project-lakitu/app-emulation/cloud-init/files/21.4-remove-sshd-dependency.patch
index 933bf2b..b6bca6d 100644
--- a/project-lakitu/app-emulation/cloud-init/files/21.2-remove-sshd-dependency.patch
+++ b/project-lakitu/app-emulation/cloud-init/files/21.4-remove-sshd-dependency.patch
@@ -4,8 +4,8 @@
 Date: Sat, 5 Jun 2021 01:00:05 +0000
 Subject: [PATCH] Remove sshd service dependency and hv_kvp_daemon dep
 
-diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
-index 9ad3574c..6a8592ed 100644
+diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl
+index 7166f640..ff9c644d 100644
 --- a/systemd/cloud-init-local.service.tmpl
 +++ b/systemd/cloud-init-local.service.tmpl
 @@ -5,7 +5,6 @@ Description=Initial cloud-init job (pre-networking)
@@ -17,19 +17,19 @@
  Before=NetworkManager.service
  Before=network-pre.target
 diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
-index f140344d..f262cd7a 100644
+index de3f3d91..3f59ab9e 100644
 --- a/systemd/cloud-init.service.tmpl
 +++ b/systemd/cloud-init.service.tmpl
-@@ -3,8 +3,6 @@
- Description=Initial cloud-init job (metadata service crawler)
+@@ -5,8 +5,6 @@ Description=Initial cloud-init job (metadata service crawler)
  DefaultDependencies=no
+ {% endif %}
  Wants=cloud-init-local.service
 -Wants=sshd-keygen.service
 -Wants=sshd.service
  After=cloud-init-local.service
  After=systemd-networkd-wait-online.service
  {% if variant in ["ubuntu", "unknown", "debian"] %}
-@@ -21,8 +19,6 @@ After=wicked.service
+@@ -24,8 +22,6 @@ After=wicked.service
  After=dbus.service
  {% endif %}
  Before=network-online.target
@@ -38,7 +38,15 @@
  {% if variant in ["ubuntu", "unknown", "debian"] %}
  Before=sysinit.target
  Before=shutdown.target
-(END)
+@@ -35,7 +31,6 @@ Conflicts=shutdown.target
+ Before=shutdown.target
+ Conflicts=shutdown.target
+ {% endif %}
+-Before=systemd-user-sessions.service
+ 
+ [Service]
+ Type=oneshot
+
 -- 
 2.25.1.481.gfbce0eb801-goog
 
diff --git a/project-lakitu/app-emulation/cloud-init/files/21.2-skip-root-ssh-keys.patch b/project-lakitu/app-emulation/cloud-init/files/21.4-skip-root-ssh-keys.patch
similarity index 100%
rename from project-lakitu/app-emulation/cloud-init/files/21.2-skip-root-ssh-keys.patch
rename to project-lakitu/app-emulation/cloud-init/files/21.4-skip-root-ssh-keys.patch
diff --git a/project-lakitu/app-emulation/cloud-init/files/21.2-stable-uid.patch b/project-lakitu/app-emulation/cloud-init/files/21.4-stable-uid.patch
similarity index 81%
rename from project-lakitu/app-emulation/cloud-init/files/21.2-stable-uid.patch
rename to project-lakitu/app-emulation/cloud-init/files/21.4-stable-uid.patch
index e8f04c8..e3c27fb 100644
--- a/project-lakitu/app-emulation/cloud-init/files/21.2-stable-uid.patch
+++ b/project-lakitu/app-emulation/cloud-init/files/21.4-stable-uid.patch
@@ -19,15 +19,16 @@
 Original Author: Andrey Ulanov <andreyu@google.com>
 Original Date:   Thu Feb 25 18:41:48 2016 -0800
 ---
- cloudinit/config/cc_users_groups.py | 32 +++++++++++++++++++++++++++++
- cloudinit/distros/__init__.py       |  6 ++++--
- 2 files changed, 36 insertions(+), 2 deletions(-)
+---
+ cloudinit/config/cc_users_groups.py | 31 +++++++++++++++++++++++++++++
+ cloudinit/distros/__init__.py       |  5 +++--
+ 2 files changed, 34 insertions(+), 2 deletions(-)
 
 diff --git a/cloudinit/config/cc_users_groups.py b/cloudinit/config/cc_users_groups.py
-index c32a743a..3bc6d563 100644
+index ac4a4410..66e33205 100644
 --- a/cloudinit/config/cc_users_groups.py
 +++ b/cloudinit/config/cc_users_groups.py
-@@ -128,6 +128,9 @@ from cloudinit import log as logging
+@@ -135,6 +135,9 @@ from cloudinit import log as logging
  
  from cloudinit.settings import PER_INSTANCE
  
@@ -37,7 +38,7 @@
  LOG = logging.getLogger(__name__)
  
  frequency = PER_INSTANCE
-@@ -139,6 +142,8 @@ def handle(name, cfg, cloud, _log, _args):
+@@ -146,6 +149,8 @@ def handle(name, cfg, cloud, _log, _args):
      cloud_keys = cloud.get_public_ssh_keys() or []
      for (name, members) in groups.items():
          cloud.distro.create_group(name, members)
@@ -46,7 +47,7 @@
      for (user, config) in users.items():
          ssh_redirect_user = config.pop("ssh_redirect_user", False)
          if ssh_redirect_user:
-@@ -162,6 +167,33 @@ def handle(name, cfg, cloud, _log, _args):
+@@ -169,6 +174,32 @@ def handle(name, cfg, cloud, _log, _args):
              else:
                  config['ssh_redirect_user'] = default_user
                  config['cloud_public_ssh_keys'] = cloud_keys
@@ -66,7 +67,6 @@
          cloud.distro.create_user(user, **config)
  
 +        pw = pwd.getpwnam(user)
-+
 +        homedir = config['homedir'] if 'homedir' in config else ('/home/%s' % user)
 +        if os.path.isdir(homedir):
 +            stats = os.stat(homedir)
@@ -76,15 +76,15 @@
 +                raise
 +
 +    if nouids:
-+        LOG.warn('No explicit UID specified for the following users: %s. '
-+                 'UID may change after reboot.', ', '.join(nouids))
++        LOG.warn('No explicit UID specified for the following users: %s.'
++                 ' UID may change after reboot.', ', '.join(nouids))
 +
  # vi: ts=4 expandtab
 diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py
-index 2b559fe6..02465787 100755
+index cf6aad14..f1d3653d 100755
 --- a/cloudinit/distros/__init__.py
 +++ b/cloudinit/distros/__init__.py
-@@ -396,8 +396,9 @@ class Distro(object):
+@@ -442,8 +442,9 @@ class Distro(persistence.CloudInitPickleMixin, metaclass=abc.ABCMeta):
          else:
              create_groups = True
  
@@ -96,14 +96,7 @@
          if util.system_is_snappy():
              useradd_cmd.append('--extrausers')
              log_useradd_cmd.append('--extrausers')
-@@ -416,6 +417,7 @@ class Distro(object):
-             "expiredate": '--expiredate',
-             "inactive": '--inactive',
-             "selinux_user": '--selinux-user',
-+            "uid": '--uid',
-         }
- 
-         useradd_flags = {
 -- 
-2.25.1.481.gfbce0eb801-goog
+2.34.1.575.g55b058a8bb-goog
+
 
diff --git a/project-lakitu/app-emulation/cloud-init/files/cloud-init-21.2-gentoo-support-upstream-templates.patch b/project-lakitu/app-emulation/cloud-init/files/cloud-init-21.2-gentoo-support-upstream-templates.patch
index fb4eed7..870b29d 100644
--- a/project-lakitu/app-emulation/cloud-init/files/cloud-init-21.2-gentoo-support-upstream-templates.patch
+++ b/project-lakitu/app-emulation/cloud-init/files/cloud-init-21.2-gentoo-support-upstream-templates.patch
@@ -5,40 +5,34 @@
 
 ---
  config/cloud.cfg.tmpl       |  8 ++++++--
- templates/hosts.gentoo.tmpl | 24 ++++++++++++++++++++++++
+ templates/hosts.gentoo.tmpl | 23 +++++++++++++++++++++++
  tools/render-cloudcfg       |  2 +-
- 3 files changed, 31 insertions(+), 3 deletions(-)
+ 3 files changed, 30 insertions(+), 3 deletions(-)
  create mode 100644 templates/hosts.gentoo.tmpl
 
 diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
-index 1fef133a..3f5a41a2 100644
+index b66bbe60..3ee03343 100644
 --- a/config/cloud.cfg.tmpl
 +++ b/config/cloud.cfg.tmpl
-@@ -134,7 +134,7 @@ cloud_final_modules:
- # (not accessible to handlers/transforms)
+@@ -176,7 +176,7 @@ cloud_final_modules:
  system_info:
     # This will affect which distro class gets used
--{% if variant in ["alpine", "amazon", "arch", "centos", "debian",
--                  "fedora", "freebsd", "netbsd", "openbsd", "rhel",
--                  "suse", "ubuntu"] %}
-+{% if variant in ["alpine", "amazon", "arch", "centos", "debian",
-+                  "fedora", "freebsd", "gentoo", "netbsd",
-+                  "openbsd", "rhel", "suse", "ubuntu"] %}
+ {% if variant in ["almalinux", "alpine", "amazon", "arch", "centos", "cloudlinux", "debian",
+-                  "eurolinux", "fedora", "freebsd", "netbsd", "openbsd", "openEuler",
++                  "eurolinux", "fedora", "freebsd", "gentoo", "netbsd", "openbsd", "openEuler",
+                   "photon", "rhel", "rocky", "suse", "ubuntu", "virtuozzo"] %}
     distro: {{ variant }}
- {% else %}
-    # Unknown/fallback distro.
-@@ -172,7 +172,7 @@ system_info:
-          primary: http://ports.ubuntu.com/ubuntu-ports
+ {% elif variant in ["dragonfly"] %}
+@@ -231,7 +231,7 @@ system_info:
           security: http://ports.ubuntu.com/ubuntu-ports
     ssh_svcname: ssh
--{% elif variant in ["alpine", "amazon", "arch", "centos", "fedora",
--                    "rhel", "suse"] %}
-+{% elif variant in ["alpine", "amazon", "arch", "centos", "fedora",
-+                    "gentoo", "rhel", "suse"] %}
+ {% elif variant in ["almalinux", "alpine", "amazon", "arch", "centos", "cloudlinux", "eurolinux",
+-                    "fedora", "openEuler", "rhel", "rocky", "suse", "virtuozzo"] %}
++                    "fedora", "openEuler", "gentoo", "rhel", "rocky", "suse", "virtuozzo"] %}
     # Default user name + that default users groups (if added/used)
     default_user:
-      name: {{ variant }}
-@@ -180,6 +180,10 @@ system_info:
+ {% if variant == "amazon" %}
+@@ -245,6 +245,10 @@ system_info:
  {% endif %}
  {% if variant == "suse" %}
       groups: [cdrom, users]
@@ -46,15 +40,15 @@
 +     groups: [users, wheel]
 +     primary_group: users
 +     no_user_group: true
+ {% elif variant == "alpine" %}
+      groups: [adm, sudo]
  {% elif variant == "arch" %}
-      groups: [wheel, users]
- {% else %}
 diff --git a/templates/hosts.gentoo.tmpl b/templates/hosts.gentoo.tmpl
 new file mode 100644
-index 00000000..cd045fa6
+index 00000000..0c2bd1e9
 --- /dev/null
 +++ b/templates/hosts.gentoo.tmpl
-@@ -0,0 +1,24 @@
+@@ -0,0 +1,23 @@
 +## template:jinja
 +{#
 +This file /etc/cloud/templates/hosts.gentoo.tmpl is only utilized
@@ -78,24 +72,19 @@
 +::1 {{fqdn}} {{hostname}}
 +::1 localhost.localdomain localhost
 +::1 localhost6.localdomain6 localhost6
-+
 diff --git a/tools/render-cloudcfg b/tools/render-cloudcfg
-index 8b7cb875..d109044e 100755
+index 186d61b7..4ee3c00f 100755
 --- a/tools/render-cloudcfg
 +++ b/tools/render-cloudcfg
-@@ -4,7 +4,7 @@ import argparse
- import os
+@@ -5,7 +5,7 @@ import os
  import sys
  
--VARIANTS = ["alpine", "amazon", "arch", "centos", "debian", "fedora",
--            "freebsd", "netbsd", "openbsd", "rhel", "suse", "ubuntu",
--            "unknown"]
-+VARIANTS = ["alpine", "amazon", "arch", "centos", "debian", "fedora",
-+            "freebsd", "gentoo", "netbsd", "openbsd", "rhel", "suse",
-+            "ubuntu", "unknown"]
+ VARIANTS = ["almalinux", "alpine", "amazon", "arch", "centos", "cloudlinux", "debian",
+-            "eurolinux", "fedora", "freebsd", "netbsd", "openbsd", "openEuler", "photon",
++            "eurolinux", "fedora", "gentoo", "freebsd", "netbsd", "openbsd", "openEuler", "photon",
+             "rhel", "suse","rocky", "ubuntu", "unknown", "virtuozzo"]
  
- if "avoid-pep8-E402-import-not-top-of-file":
-     _tdir = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+ 
 -- 
-2.19.1
+2.34.1.575.g55b058a8bb-goog