prep for 8.5

ROCKY/CFG/cloud-init.cfg

-patch {
-  file: "ROCKY/_supporting/cloud-init-rocky-branding.patch"
-}
-
 add {
   file: "ROCKY/_supporting/cloud-init-rocky-support.patch"
 }

ROCKY/_supporting/cloud-init-rocky-support.patch

-diff -Nrpuw cloud-init-20.3/cloudinit/config/cc_ntp.py cloud-init-20.3-patch/cloudinit/config/cc_ntp.py
---- cloud-init-20.3/cloudinit/config/cc_ntp.py	2020-08-25 09:28:27.000000000 -0700
-+++ cloud-init-20.3-patch/cloudinit/config/cc_ntp.py	2021-05-19 23:48:29.655808889 -0700
+diff -Naupr cloud-init-21.1/cloudinit/config/cc_ntp.py cloud-init-21.1-patch/cloudinit/config/cc_ntp.py
+--- cloud-init-21.1/cloudinit/config/cc_ntp.py	2021-02-23 14:41:41.000000000 +0000
++++ cloud-init-21.1-patch/cloudinit/config/cc_ntp.py	2021-10-08 23:48:07.181164138 +0000
 @@ -25,7 +25,7 @@ frequency = PER_INSTANCE
  NTP_CONF = '/etc/ntp.conf'
  NR_POOL_SERVERS = 4
@@ -10,9 +10,9 @@ diff -Nrpuw cloud-init-20.3/cloudinit/config/cc_ntp.py cloud-init-20.3-patch/clo
  
  NTP_CLIENT_CONFIG = {
      'chrony': {
-diff -Nrpuw cloud-init-20.3/cloudinit/config/cc_yum_add_repo.py cloud-init-20.3-patch/cloudinit/config/cc_yum_add_repo.py
---- cloud-init-20.3/cloudinit/config/cc_yum_add_repo.py	2020-08-25 09:28:27.000000000 -0700
-+++ cloud-init-20.3-patch/cloudinit/config/cc_yum_add_repo.py	2021-05-19 23:48:49.166673671 -0700
+diff -Naupr cloud-init-21.1/cloudinit/config/cc_yum_add_repo.py cloud-init-21.1-patch/cloudinit/config/cc_yum_add_repo.py
+--- cloud-init-21.1/cloudinit/config/cc_yum_add_repo.py	2021-02-23 14:41:41.000000000 +0000
++++ cloud-init-21.1-patch/cloudinit/config/cc_yum_add_repo.py	2021-10-08 23:48:19.656244504 +0000
 @@ -36,7 +36,7 @@ from configparser import ConfigParser
  
  from cloudinit import util
@@ -22,10 +22,10 @@ diff -Nrpuw cloud-init-20.3/cloudinit/config/cc_yum_add_repo.py cloud-init-20.3-
  
  
  def _canonicalize_id(repo_id):
-diff -Nrpuw cloud-init-20.3/cloudinit/distros/__init__.py cloud-init-20.3-patch/cloudinit/distros/__init__.py
---- cloud-init-20.3/cloudinit/distros/__init__.py	2020-08-25 09:28:27.000000000 -0700
-+++ cloud-init-20.3-patch/cloudinit/distros/__init__.py	2021-05-19 23:51:48.659429667 -0700
-@@ -45,7 +45,7 @@ OSFAMILIES = {
+diff -Naupr cloud-init-21.1/cloudinit/distros/__init__.py cloud-init-21.1-patch/cloudinit/distros/__init__.py
+--- cloud-init-21.1/cloudinit/distros/__init__.py	2021-02-23 14:41:41.000000000 +0000
++++ cloud-init-21.1-patch/cloudinit/distros/__init__.py	2021-10-08 23:48:36.975356075 +0000
+@@ -46,7 +46,7 @@ OSFAMILIES = {
      'debian': ['debian', 'ubuntu'],
      'freebsd': ['freebsd'],
      'gentoo': ['gentoo'],
@@ -34,9 +34,9 @@ diff -Nrpuw cloud-init-20.3/cloudinit/distros/__init__.py cloud-init-20.3-patch/
      'suse': ['opensuse', 'sles'],
  }
  
-diff -Nrpuw cloud-init-20.3/cloudinit/distros/rocky.py cloud-init-20.3-patch/cloudinit/distros/rocky.py
---- cloud-init-20.3/cloudinit/distros/rocky.py	1969-12-31 17:00:00.000000000 -0700
-+++ cloud-init-20.3-patch/cloudinit/distros/rocky.py	2021-05-19 23:53:28.997734253 -0700
+diff -Naupr cloud-init-21.1/cloudinit/distros/rocky.py cloud-init-21.1-patch/cloudinit/distros/rocky.py
+--- cloud-init-21.1/cloudinit/distros/rocky.py	1970-01-01 00:00:00.000000000 +0000
++++ cloud-init-21.1-patch/cloudinit/distros/rocky.py	2021-10-08 23:49:05.858542121 +0000
 @@ -0,0 +1,8 @@
 +# file part of cloud-init
 +
@@ -46,9 +46,9 @@ diff -Nrpuw cloud-init-20.3/cloudinit/distros/rocky.py cloud-init-20.3-patch/clo
 +    pass
 +
 +# vi: ts=4 expandtab
-diff -Nrpuw cloud-init-20.3/cloudinit/net/sysconfig.py cloud-init-20.3-patch/cloudinit/net/sysconfig.py
---- cloud-init-20.3/cloudinit/net/sysconfig.py	2021-05-20 00:16:02.079356525 -0700
-+++ cloud-init-20.3-patch/cloudinit/net/sysconfig.py	2021-05-19 23:54:01.119511632 -0700
+diff -Naupr cloud-init-21.1/cloudinit/net/sysconfig.py cloud-init-21.1-patch/cloudinit/net/sysconfig.py
+--- cloud-init-21.1/cloudinit/net/sysconfig.py	2021-02-23 14:41:41.000000000 +0000
++++ cloud-init-21.1-patch/cloudinit/net/sysconfig.py	2021-10-08 23:49:35.701734331 +0000
 @@ -19,7 +19,7 @@ from .network_state import (
  
  LOG = logging.getLogger(__name__)
@@ -58,10 +58,10 @@ diff -Nrpuw cloud-init-20.3/cloudinit/net/sysconfig.py cloud-init-20.3-patch/clo
  
  
  def _make_header(sep='#'):
-diff -Nrpuw cloud-init-20.3/cloudinit/util.py cloud-init-20.3-patch/cloudinit/util.py
---- cloud-init-20.3/cloudinit/util.py	2020-08-25 09:28:27.000000000 -0700
-+++ cloud-init-20.3-patch/cloudinit/util.py	2021-05-19 23:54:42.349225881 -0700
-@@ -549,7 +549,7 @@ def system_info():
+diff -Naupr cloud-init-21.1/cloudinit/util.py cloud-init-21.1-patch/cloudinit/util.py
+--- cloud-init-21.1/cloudinit/util.py	2021-02-23 14:41:41.000000000 +0000
++++ cloud-init-21.1-patch/cloudinit/util.py	2021-10-08 23:50:19.793018351 +0000
+@@ -522,7 +522,7 @@ def system_info():
          linux_dist = info['dist'][0].lower()
          if linux_dist in (
                  'alpine', 'arch', 'centos', 'debian', 'fedora', 'rhel',
@@ -70,9 +70,9 @@ diff -Nrpuw cloud-init-20.3/cloudinit/util.py cloud-init-20.3-patch/cloudinit/ut
              var = linux_dist
          elif linux_dist in ('ubuntu', 'linuxmint', 'mint'):
              var = 'ubuntu'
-diff -Nrpuw cloud-init-20.3/config/cloud.cfg.tmpl cloud-init-20.3-patch/config/cloud.cfg.tmpl
---- cloud-init-20.3/config/cloud.cfg.tmpl	2021-05-20 00:16:02.075356552 -0700
-+++ cloud-init-20.3-patch/config/cloud.cfg.tmpl	2021-05-19 23:57:36.687017603 -0700
+diff -Naupr cloud-init-21.1/config/cloud.cfg.tmpl cloud-init-21.1-patch/config/cloud.cfg.tmpl
+--- cloud-init-21.1/config/cloud.cfg.tmpl	2021-02-23 14:41:41.000000000 +0000
++++ cloud-init-21.1-patch/config/cloud.cfg.tmpl	2021-10-08 23:52:07.479712040 +0000
 @@ -21,7 +21,8 @@ disable_root: false
  disable_root: true
  {% endif %}
@@ -101,9 +101,9 @@ diff -Nrpuw cloud-init-20.3/config/cloud.cfg.tmpl cloud-init-20.3-patch/config/c
     # Default user name + that default users groups (if added/used)
     default_user:
  {% if variant == "amazon" %}
-diff -Nrpuw cloud-init-20.3/Makefile cloud-init-20.3-patch/Makefile
---- cloud-init-20.3/Makefile	2020-08-25 09:28:27.000000000 -0700
-+++ cloud-init-20.3-patch/Makefile	2021-05-20 00:10:25.441689639 -0700
+diff -Naupr cloud-init-21.1/Makefile cloud-init-21.1-patch/Makefile
+--- cloud-init-21.1/Makefile	2021-02-23 14:41:41.000000000 +0000
++++ cloud-init-21.1-patch/Makefile	2021-10-08 23:52:38.729913327 +0000
 @@ -35,6 +35,9 @@ ci-deps-ubuntu:
  ci-deps-centos:
  	@$(PYTHON) $(CWD)/tools/read-dependencies --distro centos --test-distro
@@ -114,9 +114,9 @@ diff -Nrpuw cloud-init-20.3/Makefile cloud-init-20.3-patch/Makefile
  pip-requirements:
  	@echo "Installing cloud-init dependencies..."
  	$(PIP_INSTALL) -r "$@.txt" -q
-diff -Nrpuw cloud-init-20.3/systemd/cloud-init-generator.tmpl cloud-init-20.3-patch/systemd/cloud-init-generator.tmpl
---- cloud-init-20.3/systemd/cloud-init-generator.tmpl	2020-08-25 09:28:27.000000000 -0700
-+++ cloud-init-20.3-patch/systemd/cloud-init-generator.tmpl	2021-05-20 00:00:03.170002382 -0700
+diff -Naupr cloud-init-21.1/systemd/cloud-init-generator.tmpl cloud-init-21.1-patch/systemd/cloud-init-generator.tmpl
+--- cloud-init-21.1/systemd/cloud-init-generator.tmpl	2021-02-23 14:41:41.000000000 +0000
++++ cloud-init-21.1-patch/systemd/cloud-init-generator.tmpl	2021-10-08 23:53:06.322091066 +0000
 @@ -83,7 +83,7 @@ default() {
  
  check_for_datasource() {
@@ -126,9 +126,9 @@ diff -Nrpuw cloud-init-20.3/systemd/cloud-init-generator.tmpl cloud-init-20.3-pa
      local dsidentify="/usr/libexec/cloud-init/ds-identify"
  {% else %}
      local dsidentify="/usr/lib/cloud-init/ds-identify"
-diff -Nrpuw cloud-init-20.3/systemd/cloud-init.service.tmpl cloud-init-20.3-patch/systemd/cloud-init.service.tmpl
---- cloud-init-20.3/systemd/cloud-init.service.tmpl	2020-08-25 09:28:27.000000000 -0700
-+++ cloud-init-20.3-patch/systemd/cloud-init.service.tmpl	2021-05-20 00:00:16.746908284 -0700
+diff -Naupr cloud-init-21.1/systemd/cloud-init.service.tmpl cloud-init-21.1-patch/systemd/cloud-init.service.tmpl
+--- cloud-init-21.1/systemd/cloud-init.service.tmpl	2021-02-23 14:41:41.000000000 +0000
++++ cloud-init-21.1-patch/systemd/cloud-init.service.tmpl	2021-10-08 23:53:26.744222622 +0000
 @@ -10,7 +10,7 @@ After=systemd-networkd-wait-online.servi
  {% if variant in ["ubuntu", "unknown", "debian"] %}
  After=networking.service
@@ -138,9 +138,9 @@ diff -Nrpuw cloud-init-20.3/systemd/cloud-init.service.tmpl cloud-init-20.3-patc
  After=network.service
  After=NetworkManager.service
  {% endif %}
-diff -Nrpuw cloud-init-20.3/tools/read-dependencies cloud-init-20.3-patch/tools/read-dependencies
---- cloud-init-20.3/tools/read-dependencies	2020-08-25 09:28:27.000000000 -0700
-+++ cloud-init-20.3-patch/tools/read-dependencies	2021-05-20 00:15:48.842448266 -0700
+diff -Naupr cloud-init-21.1/tools/read-dependencies cloud-init-21.1-patch/tools/read-dependencies
+--- cloud-init-21.1/tools/read-dependencies	2021-02-23 14:41:41.000000000 +0000
++++ cloud-init-21.1-patch/tools/read-dependencies	2021-10-08 23:56:02.246225387 +0000
 @@ -25,6 +25,7 @@ DISTRO_PKG_TYPE_MAP = {
      'centos': 'redhat',
      'redhat': 'redhat',
@@ -172,9 +172,9 @@ diff -Nrpuw cloud-init-20.3/tools/read-dependencies cloud-init-20.3-patch/tools/
          pkg_list.append('rpm-build')
      subprocess.check_call(install_cmd + pkg_list)
  
-diff -Nrpuw cloud-init-20.3/tools/render-cloudcfg cloud-init-20.3-patch/tools/render-cloudcfg
---- cloud-init-20.3/tools/render-cloudcfg	2020-08-25 09:28:27.000000000 -0700
-+++ cloud-init-20.3-patch/tools/render-cloudcfg	2021-05-20 00:02:44.673883052 -0700
+diff -Naupr cloud-init-21.1/tools/render-cloudcfg cloud-init-21.1-patch/tools/render-cloudcfg
+--- cloud-init-21.1/tools/render-cloudcfg	2021-02-23 14:41:41.000000000 +0000
++++ cloud-init-21.1-patch/tools/render-cloudcfg	2021-10-08 23:56:20.840345321 +0000
 @@ -6,7 +6,7 @@ import sys
  
  VARIANTS = ["alpine", "amazon", "arch", "centos", "debian", "fedora",