Accepting request 1295166 from Cloud:Tools

- Update to version 25.1.3 (bsc#1245403)
  + Forward port
    - cloud-init-no-openstack-guess.patch
  + docs: provide example3 for PAM and ssh_pwauth behavior (#27)
  + fix: Make hotplug socket writable only by root (#25) (CVE-2024-11584)
  + fix: Don't attempt to identify non-x86 OpenStack instances (LP: #2069607)
    (CVE-2024-6174)
From 25.1.2
  + fix: ensure MAAS datasource retries on failure (#6167)

OBS-URL: https://build.opensuse.org/request/show/1295166
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cloud-init?expand=0&rev=107

cloud-init-direxist.patch

@@ -1,24 +0,0 @@
---- cloudinit/atomic_helper.py.orig
-+++ cloudinit/atomic_helper.py
-@@ -7,6 +7,8 @@ import stat
- import tempfile
- from base64 import b64decode, b64encode
- 
-+from cloudinit import util
-+
- _DEF_PERMS = 0o644
- LOG = logging.getLogger(__name__)
- 
-@@ -43,9 +45,9 @@ def write_file(
- 
-     tf = None
-     try:
--        tf = tempfile.NamedTemporaryFile(
--            dir=os.path.dirname(filename), delete=False, mode=omode
--        )
-+        dirname = os.path.dirname(filename)
-+        util.ensure_dir(dirname)
-+        tf = tempfile.NamedTemporaryFile(dir=dirname, delete=False, mode=omode)
-         LOG.debug(
-             "Atomically writing to file %s (via temporary file %s) - %s: [%o]"
-             " %d bytes/chars",

cloud-init-dont-assume-ordering-of-ThreadPoolExecutor.patch

@@ -1,100 +0,0 @@
-From 4060bed98d2637418955fdb33fc43623c8b95235 Mon Sep 17 00:00:00 2001
-From: Brett Holman <brett.holman@canonical.com>
-Date: Tue, 12 Mar 2024 22:20:06 -0600
-Subject: [PATCH 1/4] fix: Don't assume ordering of ThreadPoolExecutor
- submissions
-
----
- tests/unittests/test_url_helper.py | 52 +++++++++++++++++++++++++++---
- 1 file changed, 47 insertions(+), 5 deletions(-)
-
-Index: cloud-init-23.3/tests/unittests/test_url_helper.py
-===================================================================
---- cloud-init-23.3.orig/tests/unittests/test_url_helper.py
-+++ cloud-init-23.3/tests/unittests/test_url_helper.py
-@@ -4,6 +4,7 @@ import logging
- from functools import partial
- from threading import Event
- from time import process_time
-+from unittest.mock import ANY, call
- 
- import pytest
- import requests
-@@ -465,20 +466,72 @@ class TestDualStack:
-         """Assert expected call intervals occur"""
-         stagger = 0.1
-         with mock.patch(M_PATH + "_run_func_with_delay") as delay_func:
-+
-+            def identity_of_first_arg(x, _):
-+                return x
-+
-             dual_stack(
--                lambda x, _y: x,
-+                identity_of_first_arg,
-                 ["you", "and", "me", "and", "dog"],
-                 stagger_delay=stagger,
-                 timeout=1,
-             )
- 
--            # ensure that stagger delay for each subsequent call is:
-+            # ensure that stagger delay for each call is made with args:
-             # [ 0 * N, 1 * N, 2 * N, 3 * N, 4 * N, 5 * N] where N = stagger
-             # it appears that without an explicit wait/join we can't assert
-             # number of calls
--            for delay, call_item in enumerate(delay_func.call_args_list):
--                _, kwargs = call_item
--                assert stagger * delay == kwargs.get("delay")
-+            calls = [
-+                call(
-+                    func=identity_of_first_arg,
-+                    addr="you",
-+                    timeout=1,
-+                    event=ANY,
-+                    delay=stagger * 0,
-+                ),
-+                call(
-+                    func=identity_of_first_arg,
-+                    addr="and",
-+                    timeout=1,
-+                    event=ANY,
-+                    delay=stagger * 1,
-+                ),
-+                call(
-+                    func=identity_of_first_arg,
-+                    addr="me",
-+                    timeout=1,
-+                    event=ANY,
-+                    delay=stagger * 2,
-+                ),
-+                call(
-+                    func=identity_of_first_arg,
-+                    addr="and",
-+                    timeout=1,
-+                    event=ANY,
-+                    delay=stagger * 3,
-+                ),
-+                call(
-+                    func=identity_of_first_arg,
-+                    addr="dog",
-+                    timeout=1,
-+                    event=ANY,
-+                    delay=stagger * 4,
-+                ),
-+            ]
-+            num_calls = 0
-+            for call_instance in calls:
-+                if call_instance in delay_func.call_args_list:
-+                    num_calls += 1
-+
-+            # we can't know the order of the submitted functions' execution
-+            # we can't know how many of the submitted functions get called
-+            # in advance
-+            #
-+            # we _do_ know what the possible arg combinations are
-+            # we _do_ know from the mocked function how many got called
-+            # assert that all calls that occurred had known valid arguments
-+            # by checking for the correct number of matches
-+            assert num_calls == len(delay_func.call_args_list)
- 
- 
- ADDR1 = "https://addr1/"

cloud-init-ds-deterministic.patch

@@ -1,54 +0,0 @@
---- tests/unittests/test_ds_identify.py.orig
-+++ tests/unittests/test_ds_identify.py
-@@ -1488,7 +1488,6 @@ VALID_CFG = {
-     },
-     "IBMCloud-metadata": {
-         "ds": "IBMCloud",
--        "policy_dmi": POLICY_FOUND_ONLY,
-         "mocks": [
-             MOCK_VIRT_IS_XEN,
-             {"name": "is_ibm_provisioning", "ret": shell_false},
-@@ -1555,7 +1554,6 @@ VALID_CFG = {
-     },
-     "IBMCloud-nodisks": {
-         "ds": "IBMCloud",
--        "policy_dmi": POLICY_FOUND_ONLY,
-         "mocks": [
-             MOCK_VIRT_IS_XEN,
-             {"name": "is_ibm_provisioning", "ret": shell_false},
-@@ -1642,7 +1640,6 @@ VALID_CFG = {
-     },
-     "VMware-NoValidTransports": {
-         "ds": "VMware",
--        "policy_dmi": POLICY_FOUND_ONLY,
-         "mocks": [
-             MOCK_VIRT_IS_VMWARE,
-         ],
-@@ -1665,7 +1662,6 @@ VALID_CFG = {
-     },
-     "VMware-EnvVar-NoData": {
-         "ds": "VMware",
--        "policy_dmi": POLICY_FOUND_ONLY,
-         "mocks": [
-             {
-                 "name": "vmware_has_envvar_vmx_guestinfo",
-@@ -1775,7 +1771,6 @@ VALID_CFG = {
-     },
-     "VMware-GuestInfo-NoData": {
-         "ds": "VMware",
--        "policy_dmi": POLICY_FOUND_ONLY,
-         "mocks": [
-             {
-                 "name": "vmware_has_rpctool",
---- tools/ds-identify.orig
-+++ tools/ds-identify
-@@ -739,9 +739,6 @@ probe_floppy() {
- dscheck_CloudStack() {
-     is_container && return ${DS_NOT_FOUND}
-     dmi_product_name_matches "CloudStack*" && return $DS_FOUND
--    if [ "$DI_VIRT" = "vmware" ] || [ "$DI_VIRT" = "xen" ]; then
--        return $DS_MAYBE
--    fi
-     return $DS_NOT_FOUND
- }
- 

cloud-init-fix-python313.patch

@@ -1,22 +0,0 @@
-From bed5ae7f777e0e4bcb5609622385ee94751c03ce Mon Sep 17 00:00:00 2001
-From: Brett Holman <brett.holman@canonical.com>
-Date: Tue, 5 Dec 2023 13:41:13 -0700
-Subject: [PATCH] fix(python3.13): Fix import error for passlib on Python 3.13
-
----
- cloudinit/sources/DataSourceAzure.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: cloud-init-23.3/cloudinit/sources/DataSourceAzure.py
-===================================================================
---- cloud-init-23.3.orig/cloudinit/sources/DataSourceAzure.py
-+++ cloud-init-23.3/cloudinit/sources/DataSourceAzure.py
-@@ -55,7 +55,7 @@ try:
-     )
- except (ImportError, AttributeError):
-     try:
--        import passlib
-+        import passlib.hash
- 
-         blowfish_hash = passlib.hash.sha512_crypt.hash
-     except ImportError:

cloud-init-keep-flake.patch

@@ -1,11 +0,0 @@
---- tools/run-lint.orig
-+++ tools/run-lint
-@@ -11,7 +11,7 @@ else
-    files=( "$@" )
- fi
- 
--cmd=( "python3" -m "ruff" "${files[@]}" )
-+cmd=( "python3" -m "flake8" "${files[@]}" )
- 
- echo "Running: " "${cmd[@]}" 1>&2
- exec "${cmd[@]}"

cloud-init-lint-fixes.patch

@@ -1,412 +0,0 @@
---- cloudinit/cmd/main.py.orig
-+++ cloudinit/cmd/main.py
-@@ -28,26 +28,27 @@ from cloudinit.config.modules import Mod
- 
- patcher.patch_logging()
- 
--from cloudinit.config.schema import validate_cloudconfig_schema
--from cloudinit import log as logging
--from cloudinit import netinfo
--from cloudinit import signal_handler
--from cloudinit import sources
--from cloudinit import stages
--from cloudinit import url_helper
--from cloudinit import util
--from cloudinit import version
--from cloudinit import warnings
--
--from cloudinit import reporting
--from cloudinit.reporting import events
-+from cloudinit.config.schema import validate_cloudconfig_schema  # noqa: E402
-+from cloudinit import log as logging  # noqa: E402
-+from cloudinit import netinfo  # noqa: E402
-+from cloudinit import signal_handler  # noqa: E402
-+from cloudinit import sources  # noqa: E402
-+from cloudinit import stages  # noqa: E402
-+from cloudinit import url_helper  # noqa: E402
-+from cloudinit import util  # noqa: E402
-+from cloudinit import version  # noqa: E402
-+from cloudinit import warnings  # noqa: E402
-+
-+from cloudinit import reporting  # noqa: E402
-+from cloudinit.reporting import events  # noqa: E402
- 
--from cloudinit.settings import PER_INSTANCE, PER_ALWAYS, PER_ONCE, CLOUD_CONFIG
-+from cloudinit.settings import (  # noqa: E402
-+        PER_INSTANCE, PER_ALWAYS, PER_ONCE, CLOUD_CONFIG)  # noqa: E402
- 
--from cloudinit import atomic_helper
-+from cloudinit import atomic_helper  # noqa: E402
- 
--from cloudinit.config import cc_set_hostname
--from cloudinit.cmd.devel import read_cfg_paths
-+from cloudinit.config import cc_set_hostname  # noqa: E402
-+from cloudinit.cmd.devel import read_cfg_paths  # noqa: E402
- 
- 
- # Welcome message template
-@@ -538,7 +539,7 @@ def di_report_warn(datasource, cfg):
-     # where Name is the thing that shows up in datasource_list.
-     modname = datasource.__module__.rpartition(".")[2]
-     if modname.startswith(sources.DS_PREFIX):
--        modname = modname[len(sources.DS_PREFIX) :]
-+        modname = modname[len(sources.DS_PREFIX):]
-     else:
-         LOG.warning(
-             "Datasource '%s' came from unexpected module '%s'.",
---- cloudinit/config/cc_apt_configure.py.orig
-+++ cloudinit/config/cc_apt_configure.py
-@@ -354,7 +354,7 @@ def mirrorurl_to_apt_fileprefix(mirror):
-         string = string[0:-1]
-     pos = string.find("://")
-     if pos >= 0:
--        string = string[pos + 3 :]
-+        string = string[pos + 3:]
-     string = string.replace("/", "_")
-     return string
- 
---- cloudinit/config/cc_ssh_authkey_fingerprints.py.orig
-+++ cloudinit/config/cc_ssh_authkey_fingerprints.py
-@@ -44,7 +44,7 @@ LOG = logging.getLogger(__name__)
- def _split_hash(bin_hash):
-     split_up = []
-     for i in range(0, len(bin_hash), 2):
--        split_up.append(bin_hash[i : i + 2])
-+        split_up.append(bin_hash[i: i + 2])
-     return split_up
- 
- 
---- cloudinit/config/modules.py.orig
-+++ cloudinit/config/modules.py
-@@ -39,7 +39,7 @@ class ModuleDetails(NamedTuple):
- def form_module_name(name):
-     canon_name = name.replace("-", "_")
-     if canon_name.lower().endswith(".py"):
--        canon_name = canon_name[0 : (len(canon_name) - 3)]
-+        canon_name = canon_name[0: (len(canon_name) - 3)]
-     canon_name = canon_name.strip()
-     if not canon_name:
-         return None
---- cloudinit/distros/parsers/ifconfig.py.orig
-+++ cloudinit/distros/parsers/ifconfig.py
-@@ -140,7 +140,7 @@ class Ifconfig:
-                 dev.index = int(toks[1])
- 
-             if toks[0] == "description:":
--                dev.description = line[line.index(":") + 2 :]
-+                dev.description = line[line.index(":") + 2:]
- 
-             if (
-                 toks[0].startswith("options=")
-@@ -165,7 +165,7 @@ class Ifconfig:
-                 dev.groups += toks[1:]
- 
-             if toks[0] == "media:":
--                dev.media = line[line.index(": ") + 2 :]
-+                dev.media = line[line.index(": ") + 2:]
- 
-             if toks[0] == "nd6":
-                 nd6_opts = re.split(r"<|>", toks[0])
---- cloudinit/net/dhcp.py.orig
-+++ cloudinit/net/dhcp.py
-@@ -415,24 +415,24 @@ class IscDhclient(DhcpClient):
-                 if len(tokens[idx:]) < req_toks:
-                     _trunc_error(net_length, req_toks, len(tokens[idx:]))
-                     return static_routes
--                net_address = ".".join(tokens[idx + 1 : idx + 5])
--                gateway = ".".join(tokens[idx + 5 : idx + req_toks])
-+                net_address = ".".join(tokens[idx + 1: idx + 5])
-+                gateway = ".".join(tokens[idx + 5: idx + req_toks])
-                 current_idx = idx + req_toks
-             elif net_length in range(17, 25):
-                 req_toks = 8
-                 if len(tokens[idx:]) < req_toks:
-                     _trunc_error(net_length, req_toks, len(tokens[idx:]))
-                     return static_routes
--                net_address = ".".join(tokens[idx + 1 : idx + 4] + ["0"])
--                gateway = ".".join(tokens[idx + 4 : idx + req_toks])
-+                net_address = ".".join(tokens[idx + 1: idx + 4] + ["0"])
-+                gateway = ".".join(tokens[idx + 4: idx + req_toks])
-                 current_idx = idx + req_toks
-             elif net_length in range(9, 17):
-                 req_toks = 7
-                 if len(tokens[idx:]) < req_toks:
-                     _trunc_error(net_length, req_toks, len(tokens[idx:]))
-                     return static_routes
--                net_address = ".".join(tokens[idx + 1 : idx + 3] + ["0", "0"])
--                gateway = ".".join(tokens[idx + 3 : idx + req_toks])
-+                net_address = ".".join(tokens[idx + 1: idx + 3] + ["0", "0"])
-+                gateway = ".".join(tokens[idx + 3: idx + req_toks])
-                 current_idx = idx + req_toks
-             elif net_length in range(1, 9):
-                 req_toks = 6
-@@ -440,9 +440,9 @@ class IscDhclient(DhcpClient):
-                     _trunc_error(net_length, req_toks, len(tokens[idx:]))
-                     return static_routes
-                 net_address = ".".join(
--                    tokens[idx + 1 : idx + 2] + ["0", "0", "0"]
-+                    tokens[idx + 1: idx + 2] + ["0", "0", "0"]
-                 )
--                gateway = ".".join(tokens[idx + 2 : idx + req_toks])
-+                gateway = ".".join(tokens[idx + 2: idx + req_toks])
-                 current_idx = idx + req_toks
-             elif net_length == 0:
-                 req_toks = 5
-@@ -450,7 +450,7 @@ class IscDhclient(DhcpClient):
-                     _trunc_error(net_length, req_toks, len(tokens[idx:]))
-                     return static_routes
-                 net_address = "0.0.0.0"
--                gateway = ".".join(tokens[idx + 1 : idx + req_toks])
-+                gateway = ".".join(tokens[idx + 1: idx + req_toks])
-                 current_idx = idx + req_toks
-             else:
-                 LOG.error(
---- cloudinit/net/network_state.py.orig
-+++ cloudinit/net/network_state.py
-@@ -135,7 +135,7 @@ class CommandHandlerMeta(type):
-         command_handlers = {}
-         for attr_name, attr in dct.items():
-             if callable(attr) and attr_name.startswith("handle_"):
--                handles_what = attr_name[len("handle_") :]
-+                handles_what = attr_name[len("handle_"):]
-                 if handles_what:
-                     command_handlers[handles_what] = attr
-         dct["command_handlers"] = command_handlers
---- cloudinit/reporting/handlers.py.orig
-+++ cloudinit/reporting/handlers.py
-@@ -295,13 +295,13 @@ class HyperVKvpReportingHandler(Reportin
-                 )
-             )
-         k = (
--            record_data[0 : self.HV_KVP_EXCHANGE_MAX_KEY_SIZE]
-+            record_data[0: self.HV_KVP_EXCHANGE_MAX_KEY_SIZE]
-             .decode("utf-8")
-             .strip("\x00")
-         )
-         v = (
-             record_data[
--                self.HV_KVP_EXCHANGE_MAX_KEY_SIZE : self.HV_KVP_RECORD_SIZE
-+                self.HV_KVP_EXCHANGE_MAX_KEY_SIZE: self.HV_KVP_RECORD_SIZE
-             ]
-             .decode("utf-8")
-             .strip("\x00")
-@@ -320,7 +320,7 @@ class HyperVKvpReportingHandler(Reportin
-     def _break_down(self, key, meta_data, description):
-         del meta_data[self.MSG_KEY]
-         des_in_json = json.dumps(description)
--        des_in_json = des_in_json[1 : (len(des_in_json) - 1)]
-+        des_in_json = des_in_json[1: (len(des_in_json) - 1)]
-         i = 0
-         result_array = []
-         message_place_holder = '"' + self.MSG_KEY + '":""'
-@@ -353,7 +353,7 @@ class HyperVKvpReportingHandler(Reportin
-         Values will be truncated as needed.
-         """
-         if len(value) >= self.HV_KVP_AZURE_MAX_VALUE_SIZE:
--            value = value[0 : self.HV_KVP_AZURE_MAX_VALUE_SIZE - 1]
-+            value = value[0: self.HV_KVP_AZURE_MAX_VALUE_SIZE - 1]
- 
-         data = [self._encode_kvp_item(key, value)]
- 
---- cloudinit/sources/__init__.py.orig
-+++ cloudinit/sources/__init__.py
-@@ -747,7 +747,7 @@ class DataSource(CloudInitPickleMixin, m
-             if not short_name.startswith(nfrom):
-                 continue
-             for nto in tlist:
--                cand = "/dev/%s%s" % (nto, short_name[len(nfrom) :])
-+                cand = "/dev/%s%s" % (nto, short_name[len(nfrom):])
-                 if os.path.exists(cand):
-                     return cand
-         return None
---- cloudinit/sources/helpers/azure.py.orig
-+++ cloudinit/sources/helpers/azure.py
-@@ -566,7 +566,7 @@ class OpenSSLManager:
-         """
-         raw_fp = self._run_x509_action("-fingerprint", certificate)
-         eq = raw_fp.find("=")
--        octets = raw_fp[eq + 1 : -1].split(":")
-+        octets = raw_fp[eq + 1: -1].split(":")
-         return "".join(octets)
- 
-     @azure_ds_telemetry_reporter
---- cloudinit/sources/helpers/netlink.py.orig
-+++ cloudinit/sources/helpers/netlink.py
-@@ -150,7 +150,7 @@ def unpack_rta_attr(data, offset):
-         return None  # Should mean our offset is >= remaining data
- 
-     # Unpack just the attribute's data. Offset by 4 to skip length/type header
--    attr_data = data[offset + RTA_DATA_START_OFFSET : offset + length]
-+    attr_data = data[offset + RTA_DATA_START_OFFSET: offset + length]
-     return RTAAttr(length, rta_type, attr_data)
- 
- 
---- cloudinit/ssh_util.py.orig
-+++ cloudinit/ssh_util.py
-@@ -659,7 +659,7 @@ def get_opensshd_version():
-     prefix = "OpenSSH_"
-     for line in err.split("\n"):
-         if line.startswith(prefix):
--            return line[len(prefix) : line.find(",")]
-+            return line[len(prefix): line.find(",")]
-     return None
- 
- 
---- cloudinit/url_helper.py.orig
-+++ cloudinit/url_helper.py
-@@ -73,7 +73,7 @@ def read_file_or_url(url, **kwargs) -> U
-     if url.lower().startswith("file://"):
-         if kwargs.get("data"):
-             LOG.warning("Unable to post data to file resource %s", url)
--        file_path = url[len("file://") :]
-+        file_path = url[len("file://"):]
-         try:
-             with open(file_path, "rb") as fp:
-                 contents = fp.read()
---- cloudinit/user_data.py.orig
-+++ cloudinit/user_data.py
-@@ -211,13 +211,13 @@ class UserDataProcessor:
-         for line in content.splitlines():
-             lc_line = line.lower()
-             if lc_line.startswith("#include-once"):
--                line = line[len("#include-once") :].lstrip()
-+                line = line[len("#include-once"):].lstrip()
-                 # Every following include will now
-                 # not be refetched.... but will be
-                 # re-read from a local urlcache (if it worked)
-                 include_once_on = True
-             elif lc_line.startswith("#include"):
--                line = line[len("#include") :].lstrip()
-+                line = line[len("#include"):].lstrip()
-                 # Disable the include once if it was on
-                 # if it wasn't, then this has no effect.
-                 include_once_on = False
---- cloudinit/util.py.orig
-+++ cloudinit/util.py
-@@ -1177,7 +1177,7 @@ def read_cc_from_cmdline(cmdline=None):
-         if end < 0:
-             end = clen
-         tokens.append(
--            parse.unquote(cmdline[begin + begin_l : end].lstrip()).replace(
-+            parse.unquote(cmdline[begin + begin_l: end].lstrip()).replace(
-                 "\\n", "\n"
-             )
-         )
-@@ -1724,7 +1724,7 @@ def get_output_cfg(cfg, mode):
-         found = False
-         for s in swlist:
-             if val.startswith(s):
--                val = "%s %s" % (s, val[len(s) :].strip())
-+                val = "%s %s" % (s, val[len(s):].strip())
-                 found = True
-                 break
-         if not found:
-@@ -2362,7 +2362,7 @@ def shellify(cmdlist, add_header=True):
- 
- def strip_prefix_suffix(line, prefix=None, suffix=None):
-     if prefix and line.startswith(prefix):
--        line = line[len(prefix) :]
-+        line = line[len(prefix):]
-     if suffix and line.endswith(suffix):
-         line = line[: -len(suffix)]
-     return line
-@@ -2942,7 +2942,7 @@ def human2bytes(size):
-     for m in mpliers:
-         if size.endswith(m):
-             mplier = m
--            num = size[0 : -len(m)]
-+            num = size[0: -len(m)]
- 
-     try:
-         num = float(num)
-@@ -3022,12 +3022,12 @@ def rootdev_from_cmdline(cmdline):
-     if found.startswith("/dev/"):
-         return found
-     if found.startswith("LABEL="):
--        return "/dev/disk/by-label/" + found[len("LABEL=") :]
-+        return "/dev/disk/by-label/" + found[len("LABEL="):]
-     if found.startswith("UUID="):
--        return "/dev/disk/by-uuid/" + found[len("UUID=") :].lower()
-+        return "/dev/disk/by-uuid/" + found[len("UUID="):].lower()
-     if found.startswith("PARTUUID="):
-         disks_path = (
--            "/dev/disk/by-partuuid/" + found[len("PARTUUID=") :].lower()
-+            "/dev/disk/by-partuuid/" + found[len("PARTUUID="):].lower()
-         )
-         if os.path.exists(disks_path):
-             return disks_path
---- setup.py.orig
-+++ setup.py
-@@ -187,7 +187,7 @@ elif os.path.isfile("/etc/system-release
-         else:
-             # String formatted CPE
-             inc = 1
--        (cpe_vendor, cpe_product, cpe_version) = cpe_data[2 + inc : 5 + inc]
-+        (cpe_vendor, cpe_product, cpe_version) = cpe_data[2 + inc: 5 + inc]
-         if cpe_vendor == "amazon":
-             USR_LIB_EXEC = "usr/libexec"
- 
---- tests/unittests/helpers.py.orig
-+++ tests/unittests/helpers.py
-@@ -265,7 +265,7 @@ class FilesystemMockingTestCase(Resource
-         real_root = os.path.join(real_root, "roots", example_root)
-         for (dir_path, _dirnames, filenames) in os.walk(real_root):
-             real_path = dir_path
--            make_path = rebase_path(real_path[len(real_root) :], target_root)
-+            make_path = rebase_path(real_path[len(real_root):], target_root)
-             util.ensure_dir(make_path)
-             for f in filenames:
-                 real_path = util.abs_join(real_path, f)
-@@ -469,7 +469,7 @@ def dir2dict(startdir, prefix=None):
-     for root, _dirs, files in os.walk(startdir):
-         for fname in files:
-             fpath = os.path.join(root, fname)
--            key = fpath[len(prefix) :]
-+            key = fpath[len(prefix):]
-             flist[key] = util.load_file(fpath)
-     return flist
- 
---- tests/unittests/reporting/test_reporting_hyperv.py.orig
-+++ tests/unittests/reporting/test_reporting_hyperv.py
-@@ -293,7 +293,7 @@ class TextKvpReporter(CiTestCase):
-                 reporter,
-                 2,
-                 [
--                    log_content[-azure.MAX_LOG_TO_KVP_LENGTH :].encode(),
-+                    log_content[-azure.MAX_LOG_TO_KVP_LENGTH:].encode(),
-                     extra_content.encode(),
-                 ],
-             )
---- tests/unittests/sources/test_configdrive.py.orig
-+++ tests/unittests/sources/test_configdrive.py
-@@ -412,7 +412,7 @@ class TestConfigDriveDataSource(CiTestCa
-         }
-         for name, dev_name in name_tests.items():
-             with ExitStack() as mocks:
--                provided_name = dev_name[len("/dev/") :]
-+                provided_name = dev_name[len("/dev/"):]
-                 provided_name = "s" + provided_name[1:]
-                 find_mock = mocks.enter_context(
-                     mock.patch.object(
---- tests/unittests/sources/test_maas.py.orig
-+++ tests/unittests/sources/test_maas.py
-@@ -131,7 +131,7 @@ class TestMAASDataSource(CiTestCase):
-             if not url.startswith(prefix):
-                 raise ValueError("unexpected call %s" % url)
- 
--            short = url[len(prefix) :]
-+            short = url[len(prefix):]
-             if short not in data:
-                 raise url_helper.UrlError("not found", code=404, url=url)
-             return url_helper.StringResponse(data[short])
---- tests/unittests/sources/test_smartos.py.orig
-+++ tests/unittests/sources/test_smartos.py
-@@ -766,7 +766,7 @@ class ShortReader:
-             rsize = next_null - self.index + 1
-         i = self.index
-         self.index += rsize
--        ret = self.data[i : i + rsize]
-+        ret = self.data[i: i + rsize]
-         if len(ret) and ret[-1:] == self.endbyte:
-             ret = ret[:-1]
-         return ret

cloud-init-no-nmcfg-needed.patch

@@ -1,27 +0,0 @@
---- cloudinit/net/network_manager.py.orig
-+++ cloudinit/net/network_manager.py
-@@ -9,7 +9,6 @@
- import configparser
- import io
- import itertools
--import os
- import uuid
- from typing import Optional
- 
-@@ -401,7 +400,6 @@ def available(target=None):
-     # It is imported here to avoid circular import
-     from cloudinit.distros import uses_systemd
- 
--    config_present = os.path.isfile(subp.target_path(target, path=NM_CFG_FILE))
-     nmcli_present = subp.which("nmcli", target=target)
-     service_active = True
-     if uses_systemd():
-@@ -410,7 +408,7 @@ def available(target=None):
-         except subp.ProcessExecutionError:
-             service_active = False
- 
--    return config_present and bool(nmcli_present) and service_active
-+    return bool(nmcli_present) and service_active
- 
- 
- # vi: ts=4 expandtab

cloud-init-pckg-reboot.patch

@@ -1,28 +0,0 @@
---- cloudinit/config/cc_package_update_upgrade_install.py.orig
-+++ cloudinit/config/cc_package_update_upgrade_install.py
-@@ -18,7 +18,7 @@ from cloudinit.config.schema import Meta
- from cloudinit.distros import ALL_DISTROS
- from cloudinit.settings import PER_INSTANCE
- 
--REBOOT_FILE = "/var/run/reboot-required"
-+REBOOT_FILES = ("/var/run/reboot-required", "/run/reboot-needed")
- REBOOT_CMD = ["/sbin/reboot"]
- 
- MODULE_DESCRIPTION = """\
-@@ -120,11 +120,14 @@ def handle(name: str, cfg: Config, cloud
-     # kernel and openssl (possibly some other packages)
-     # write a file /var/run/reboot-required after upgrading.
-     # if that file exists and configured, then just stop right now and reboot
--    reboot_fn_exists = os.path.isfile(REBOOT_FILE)
-+    for reboot_marker in REBOOT_FILES:
-+        reboot_fn_exists = os.path.isfile(reboot_marker)
-+        if reboot_fn_exists:
-+            break
-     if (upgrade or pkglist) and reboot_if_required and reboot_fn_exists:
-         try:
-             LOG.warning(
--                "Rebooting after upgrade or install per %s", REBOOT_FILE
-+                "Rebooting after upgrade or install per %s", reboot_marker
-             )
-             # Flush the above warning + anything else out...
-             logging.flushLoggers(LOG)

cloud-init-skip-empty-conf.patch

@@ -1,374 +0,0 @@
---- tests/unittests/config/test_cc_yum_add_repo.py.orig
-+++ tests/unittests/config/test_cc_yum_add_repo.py
-@@ -2,7 +2,7 @@
- 
- import configparser
- import logging
--import re
-+# import re
- import shutil
- import tempfile
- 
-@@ -137,10 +137,10 @@ class TestAddYumRepoSchema:
-                 {"yum_repo_dir": True},
-                 "yum_repo_dir: True is not of type 'string'",
-             ),
--            (
--                {"yum_repos": {}},
--                re.escape("yum_repos: {} does not have enough properties"),
--            ),
-+            # (
-+            #     {"yum_repos": {}},
-+            #     re.escape("yum_repos: {} does not have enough properties"),
-+            # ),
-             # baseurl required
-             (
-                 {"yum_repos": {"My-Repo": {}}},
---- tests/unittests/config/test_cc_apk_configure.py.orig
-+++ tests/unittests/config/test_cc_apk_configure.py
-@@ -352,11 +352,11 @@ class TestApkConfigureSchema:
-                     " allowed ('bogus' was unexpected)"
-                 ),
-             ),
--            (
--                {"apk_repos": {"alpine_repo": {}}},
--                "apk_repos.alpine_repo: 'version' is a required property,"
--                " apk_repos.alpine_repo: {} does not have enough properties",
--            ),
-+            # (
-+            #     {"apk_repos": {"alpine_repo": {}}},
-+            #     "apk_repos.alpine_repo: 'version' is a required property,"
-+            #     " apk_repos.alpine_repo: {} does not have enough properties",
-+            # ),
-             (
-                 {"apk_repos": {"alpine_repo": True}},
-                 "apk_repos.alpine_repo: True is not of type 'object', 'null'",
-@@ -366,10 +366,10 @@ class TestApkConfigureSchema:
-                 "apk_repos.preserve_repositories: 'wrongtype' is not of type"
-                 " 'boolean'",
-             ),
--            (
--                {"apk_repos": {}},
--                "apk_repos: {} does not have enough properties",
--            ),
-+            # (
-+            #     {"apk_repos": {}},
-+            #     "apk_repos: {} does not have enough properties",
-+            # ),
-             (
-                 {"apk_repos": {"local_repo_base_url": None}},
-                 "apk_repos.local_repo_base_url: None is not of type 'string'",
---- tests/unittests/config/test_cc_apt_configure.py.orig
-+++ tests/unittests/config/test_cc_apt_configure.py
-@@ -32,7 +32,7 @@ class TestAPTConfigureSchema:
-                     " ('boguskey' was unexpected)"
-                 ),
-             ),
--            ({"apt": {}}, "apt: {} does not have enough properties"),
-+            # ({"apt": {}}, "apt: {} does not have enough properties"),
-             (
-                 {"apt": {"preserve_sources_list": 1}},
-                 "apt.preserve_sources_list: 1 is not of type 'boolean'",
-@@ -41,10 +41,10 @@ class TestAPTConfigureSchema:
-                 {"apt": {"disable_suites": 1}},
-                 "apt.disable_suites: 1 is not of type 'array'",
-             ),
--            (
--                {"apt": {"disable_suites": []}},
--                re.escape("apt.disable_suites: [] is too short"),
--            ),
-+            # (
-+            #     {"apt": {"disable_suites": []}},
-+            #     re.escape("apt.disable_suites: [] is too short"),
-+            # ),
-             (
-                 {"apt": {"disable_suites": [1]}},
-                 "apt.disable_suites.0: 1 is not of type 'string'",
-@@ -61,18 +61,18 @@ class TestAPTConfigureSchema:
-                 {"apt": {"primary": "nonlist"}},
-                 "apt.primary: 'nonlist' is not of type 'array'",
-             ),
--            (
--                {"apt": {"primary": []}},
--                re.escape("apt.primary: [] is too short"),
--            ),
-+            # (
-+            #     {"apt": {"primary": []}},
-+            #     re.escape("apt.primary: [] is too short"),
-+            # ),
-             (
-                 {"apt": {"primary": ["nonobj"]}},
-                 "apt.primary.0: 'nonobj' is not of type 'object'",
-             ),
--            (
--                {"apt": {"primary": [{}]}},
--                "apt.primary.0: 'arches' is a required property",
--            ),
-+            # (
-+            #     {"apt": {"primary": [{}]}},
-+            #     "apt.primary.0: 'arches' is a required property",
-+            # ),
-             (
-                 {"apt": {"primary": [{"boguskey": True}]}},
-                 re.escape(
-@@ -98,10 +98,10 @@ class TestAPTConfigureSchema:
-                 },
-                 "apt.primary.0.search: 'non-array' is not of type 'array'",
-             ),
--            (
--                {"apt": {"primary": [{"arches": ["amd64"], "search": []}]}},
--                re.escape("apt.primary.0.search: [] is too short"),
--            ),
-+            # (
-+            #     {"apt": {"primary": [{"arches": ["amd64"], "search": []}]}},
-+            #     re.escape("apt.primary.0.search: [] is too short"),
-+            # ),
-             (
-                 {
-                     "apt": {
-@@ -130,10 +130,10 @@ class TestAPTConfigureSchema:
-                 {"apt": {"debconf_selections": True}},
-                 "apt.debconf_selections: True is not of type 'object'",
-             ),
--            (
--                {"apt": {"debconf_selections": {}}},
--                "apt.debconf_selections: {} does not have enough properties",
--            ),
-+            # (
-+            #     {"apt": {"debconf_selections": {}}},
-+            #     "apt.debconf_selections: {} does not have enough properties",
-+            # ),
-             (
-                 {"apt": {"sources_list": True}},
-                 "apt.sources_list: True is not of type 'string'",
-@@ -166,10 +166,10 @@ class TestAPTConfigureSchema:
-                 {"apt": {"sources": {"opaquekey": True}}},
-                 "apt.sources.opaquekey: True is not of type 'object'",
-             ),
--            (
--                {"apt": {"sources": {"opaquekey": {}}}},
--                "apt.sources.opaquekey: {} does not have enough properties",
--            ),
-+            # (
-+            #     {"apt": {"sources": {"opaquekey": {}}}},
-+            #     "apt.sources.opaquekey: {} does not have enough properties",
-+            # ),
-             (
-                 {"apt": {"sources": {"opaquekey": {"boguskey": True}}}},
-                 re.escape(
---- tests/unittests/config/test_cc_bootcmd.py.orig
-+++ tests/unittests/config/test_cc_bootcmd.py
-@@ -1,5 +1,5 @@
- # This file is part of cloud-init. See LICENSE file for license information.
--import re
-+# import re
- import tempfile
- 
- import pytest
-@@ -128,13 +128,13 @@ class TestBootCMDSchema:
-                 "Cloud config schema errors: bootcmd: 1 is not of type"
-                 " 'array'",
-             ),
--            ({"bootcmd": []}, re.escape("bootcmd: [] is too short")),
--            (
--                {"bootcmd": []},
--                re.escape(
--                    "Cloud config schema errors: bootcmd: [] is too short"
--                ),
--            ),
-+            # ({"bootcmd": []}, re.escape("bootcmd: [] is too short")),
-+            # (
-+            #     {"bootcmd": []},
-+            #     re.escape(
-+            #         "Cloud config schema errors: bootcmd: [] is too short"
-+            #     ),
-+            # ),
-             (
-                 {
-                     "bootcmd": [
---- tests/unittests/config/test_cc_ca_certs.py.orig
-+++ tests/unittests/config/test_cc_ca_certs.py
-@@ -394,10 +394,10 @@ class TestCACertsSchema:
-                 {"ca_certs": 1},
-                 "ca_certs: 1 is not of type 'object'",
-             ),
--            (
--                {"ca_certs": {}},
--                re.escape("ca_certs: {} does not have enough properties"),
--            ),
-+            # (
-+            #     {"ca_certs": {}},
-+            #     re.escape("ca_certs: {} does not have enough properties"),
-+            # ),
-             (
-                 {"ca_certs": {"boguskey": 1}},
-                 re.escape(
-@@ -413,10 +413,10 @@ class TestCACertsSchema:
-                 {"ca_certs": {"trusted": [1]}},
-                 "ca_certs.trusted.0: 1 is not of type 'string'",
-             ),
--            (
--                {"ca_certs": {"trusted": []}},
--                re.escape("ca_certs.trusted: [] is too short"),
--            ),
-+            # (
-+            #     {"ca_certs": {"trusted": []}},
-+            #     re.escape("ca_certs.trusted: [] is too short"),
-+            # ),
-         ),
-     )
-     @skipUnlessJsonSchema()
---- tests/unittests/config/test_cc_chef.py.orig
-+++ tests/unittests/config/test_cc_chef.py
-@@ -304,10 +304,10 @@ class TestBootCMDSchema:
-                 {"chef": 1},
-                 "chef: 1 is not of type 'object'",
-             ),
--            (
--                {"chef": {}},
--                re.escape(" chef: {} does not have enough properties"),
--            ),
-+            # (
-+            #     {"chef": {}},
-+            #     re.escape(" chef: {} does not have enough properties"),
-+            # ),
-             (
-                 {"chef": {"boguskey": True}},
-                 re.escape(
-@@ -319,10 +319,10 @@ class TestBootCMDSchema:
-                 {"chef": {"directories": 1}},
-                 "chef.directories: 1 is not of type 'array'",
-             ),
--            (
--                {"chef": {"directories": []}},
--                re.escape("chef.directories: [] is too short"),
--            ),
-+            # (
-+            #     {"chef": {"directories": []}},
-+            #     re.escape("chef.directories: [] is too short"),
-+            # ),
-             (
-                 {"chef": {"directories": [1]}},
-                 "chef.directories.0: 1 is not of type 'string'",
---- tests/unittests/config/test_cc_lxd.py.orig
-+++ tests/unittests/config/test_cc_lxd.py
-@@ -385,7 +385,7 @@ class TestLXDSchema:
-             # Require bridge.mode
-             ({"lxd": {"bridge": {}}}, "bridge: 'mode' is a required property"),
-             # Require init or bridge keys
--            ({"lxd": {}}, "lxd: {} does not have enough properties"),
-+            # ({"lxd": {}}, "lxd: {} does not have enough properties"),
-             # Require some non-empty preseed config of type string
-             ({"lxd": {"preseed": {}}}, "not of type 'string'"),
-             ({"lxd": {"preseed": ""}}, None),
---- tests/unittests/config/test_cc_mounts.py.orig
-+++ tests/unittests/config/test_cc_mounts.py
-@@ -583,9 +583,9 @@ class TestMountsSchema:
-         "config, error_msg",
-         [
-             # We expect to see one mount if provided in user-data.
--            ({"mounts": []}, re.escape("mounts: [] is too short")),
-+            # ({"mounts": []}, re.escape("mounts: [] is too short")),
-             # Disallow less than 1 item per mount entry
--            ({"mounts": [[]]}, re.escape("mounts.0: [] is too short")),
-+            # ({"mounts": [[]]}, re.escape("mounts.0: [] is too short")),
-             # Disallow more than 6 items per mount entry
-             ({"mounts": [["1"] * 7]}, "mounts.0:.* is too long"),
-             # Disallow mount_default_fields will anything other than 6 items
---- tests/unittests/config/test_cc_package_update_upgrade_install.py.orig
-+++ tests/unittests/config/test_cc_package_update_upgrade_install.py
-@@ -17,7 +17,7 @@ class TestPackageUpdateUpgradeSchema:
-             # packages list with three entries (2 required)
-             ({"packages": ["p1", ["p2", "p3", "p4"]]}, ""),
-             # empty packages list
--            ({"packages": []}, "is too short"),
-+            # ({"packages": []}, "is too short"),
-             (
-                 {"apt_update": False},
-                 (
---- tests/unittests/config/test_cc_runcmd.py.orig
-+++ tests/unittests/config/test_cc_runcmd.py
-@@ -90,7 +90,7 @@ class TestRunCmdSchema:
-             ({"runcmd": ["echo bye", "echo bye"]}, None),
-             # Invalid schemas
-             ({"runcmd": 1}, "1 is not of type 'array'"),
--            ({"runcmd": []}, r"runcmd: \[\] is too short"),
-+            # ({"runcmd": []}, r"runcmd: \[\] is too short"),
-             (
-                 {
-                     "runcmd": [
---- tests/unittests/config/test_cc_set_passwords.py.orig
-+++ tests/unittests/config/test_cc_set_passwords.py
-@@ -715,12 +715,12 @@ class TestSetPasswordsSchema:
-                 {"chpasswd": {"list": ["user"]}},
-                 pytest.raises(SchemaValidationError),
-             ),
--            (
--                {"chpasswd": {"list": []}},
--                pytest.raises(
--                    SchemaValidationError, match=r"\[\] is too short"
--                ),
--            ),
-+            # (
-+            #     {"chpasswd": {"list": []}},
-+            #     pytest.raises(
-+            #         SchemaValidationError, match=r"\[\] is too short"
-+            #     ),
-+            # ),
-         ],
-     )
-     @skipUnlessJsonSchema()
---- tests/unittests/config/test_cc_snap.py.orig
-+++ tests/unittests/config/test_cc_snap.py
-@@ -279,16 +279,17 @@ class TestSnapSchema:
-                 {"snap": {"commands": ["ls"], "invalid-key": ""}},
-                 "Additional properties are not allowed",
-             ),
--            ({"snap": {}}, "{} does not have enough properties"),
-+            # ({"snap": {}}, "{} does not have enough properties"),
-             (
-                 {"snap": {"commands": "broken"}},
-                 "'broken' is not of type 'object', 'array'",
-             ),
--            ({"snap": {"commands": []}}, r"snap.commands: \[\] is too short"),
--            (
--                {"snap": {"commands": {}}},
--                r"snap.commands: {} does not have enough properties",
--            ),
-+            # ({"snap": {
-+            #     "commands": []}}, r"snap.commands: \[\] is too short"),
-+            # (
-+            #     {"snap": {"commands": {}}},
-+            #     r"snap.commands: {} does not have enough properties",
-+            # ),
-             ({"snap": {"commands": [123]}}, ""),
-             ({"snap": {"commands": {"01": 123}}}, ""),
-             ({"snap": {"commands": [["snap", "install", 123]]}}, ""),
-@@ -302,11 +303,11 @@ class TestSnapSchema:
-                 {"snap": {"assertions": "broken"}},
-                 "'broken' is not of type 'object', 'array'",
-             ),
--            ({"snap": {"assertions": []}}, r"\[\] is too short"),
--            (
--                {"snap": {"assertions": {}}},
--                r"\{} does not have enough properties",
--            ),
-+            # ({"snap": {"assertions": []}}, r"\[\] is too short"),
-+            # (
-+            #     {"snap": {"assertions": {}}},
-+            #     r"\{} does not have enough properties",
-+            # ),
-         ],
-     )
-     @skipUnlessJsonSchema()
---- tests/unittests/config/test_cc_write_files.py.orig
-+++ tests/unittests/config/test_cc_write_files.py
-@@ -222,7 +222,7 @@ class TestWriteFilesSchema:
-         [
-             # Top-level write_files type validation
-             ({"write_files": 1}, "write_files: 1 is not of type 'array'"),
--            ({"write_files": []}, re.escape("write_files: [] is too short")),
-+            # ({"write_files": []}, re.escape("write_files: [] is too short")),
-             (
-                 {"write_files": [{}]},
-                 "write_files.0: 'path' is a required property",

cloud-init-usr-sudoers.patch

@@ -1,68 +0,0 @@
---- cloudinit/distros/__init__.py.orig
-+++ cloudinit/distros/__init__.py
-@@ -880,9 +880,12 @@ class Distro(persistence.CloudInitPickle
-         # it actually exists as a directory
-         sudoers_contents = ""
-         base_exists = False
-+        system_sudo_base = "/usr/etc/sudoers"
-         if os.path.exists(sudo_base):
-             sudoers_contents = util.load_file(sudo_base)
-             base_exists = True
-+        elif os.path.exists(system_sudo_base):
-+            sudoers_contents = util.load_file(system_sudo_base)
-         found_include = False
-         for line in sudoers_contents.splitlines():
-             line = line.strip()
-@@ -907,7 +910,7 @@ class Distro(persistence.CloudInitPickle
-                         "#includedir %s" % (path),
-                         "",
-                     ]
--                    sudoers_contents = "\n".join(lines)
-+                    sudoers_contents += "\n".join(lines)
-                     util.write_file(sudo_base, sudoers_contents, 0o440)
-                 else:
-                     lines = [
---- tests/unittests/distros/test__init__.py.orig
-+++ tests/unittests/distros/test__init__.py
-@@ -230,6 +230,41 @@ class TestGenericDistro(helpers.Filesyst
-         self.assertIn("josh", contents)
-         self.assertEqual(2, contents.count("josh"))
- 
-+    def test_sudoers_ensure_append_sudoer_file(self):
-+        cls = distros.fetch("ubuntu")
-+        d = cls("ubuntu", {}, None)
-+        self.patchOS(self.tmp)
-+        self.patchUtils(self.tmp)
-+        util.write_file("/etc/sudoers", "josh, josh\n")
-+        d.ensure_sudo_dir("/b", "/etc/sudoers")
-+        contents = util.load_file("/etc/sudoers")
-+        self.assertIn("includedir /b", contents)
-+        self.assertTrue(os.path.isdir("/b"))
-+        self.assertIn("josh", contents)
-+        self.assertEqual(2, contents.count("josh"))
-+
-+    def test_usr_sudoers_ensure_new(self):
-+        cls = distros.fetch("ubuntu")
-+        d = cls("ubuntu", {}, None)
-+        self.patchOS(self.tmp)
-+        self.patchUtils(self.tmp)
-+        util.write_file("/usr/etc/sudoers", "josh, josh\n")
-+        d.ensure_sudo_dir("/b")
-+        contents = util.load_file("/etc/sudoers")
-+        self.assertIn("josh", contents)
-+        self.assertEqual(2, contents.count("josh"))
-+        self.assertIn("includedir /b", contents)
-+        self.assertTrue(os.path.isdir("/b"))
-+
-+    def test_usr_sudoers_ensure_no_etc_creat(self):
-+        cls = distros.fetch("ubuntu")
-+        d = cls("ubuntu", {}, None)
-+        self.patchOS(self.tmp)
-+        self.patchUtils(self.tmp)
-+        util.write_file("/usr/etc/sudoers", "#includedir /b")
-+        d.ensure_sudo_dir("/b")
-+        self.assertTrue(not os.path.exists("/etc/sudoers"))
-+
-     def test_sudoers_ensure_only_one_includedir(self):
-         cls = distros.fetch("ubuntu")
-         d = cls("ubuntu", {}, None)

cloud-init-wait-for-net.patch

@@ -1,36 +0,0 @@
---- cloudinit/sources/helpers/openstack.py.orig
-+++ cloudinit/sources/helpers/openstack.py
-@@ -736,7 +736,14 @@ def convert_net_json(network_json=None,
-             if not mac:
-                 raise ValueError("No mac_address or name entry for %s" % d)
-             if mac not in known_macs:
--                raise ValueError("Unable to find a system nic for %s" % d)
-+                # Let's give udev a chance to catch up
-+                try:
-+                    util.udevadm_settle()
-+                except subp.ProcessExecutionError:
-+                    pass
-+                known_macs = net.get_interfaces_by_mac()
-+                if mac not in known_macs:
-+                    raise ValueError("Unable to find a system nic for %s" % d)
-             d["name"] = known_macs[mac]
- 
-         for cfg, key, fmt, targets in link_updates:
---- tests/unittests/sources/test_configdrive.py.orig
-+++ tests/unittests/sources/test_configdrive.py
-@@ -389,6 +389,7 @@ class TestConfigDriveDataSource(CiTestCa
-             M_PATH + "util.find_devs_with", "m_find_devs_with", return_value=[]
-         )
-         self.tmp = self.tmp_dir()
-+        self.allowed_subp = True
- 
-     def test_ec2_metadata(self):
-         populate_dir(self.tmp, CFG_DRIVE_FILES_V2)
-@@ -869,6 +870,7 @@ class TestConvertNetworkData(CiTestCase)
-     def setUp(self):
-         super(TestConvertNetworkData, self).setUp()
-         self.tmp = self.tmp_dir()
-+        self.allowed_subp = True
- 
-     def _getnames_in_config(self, ncfg):
-         return set(

cloud-init-write-routes.patch

@@ -1,177 +0,0 @@
---- cloudinit/distros/__init__.py.orig
-+++ cloudinit/distros/__init__.py
-@@ -287,6 +287,15 @@ class Distro(persistence.CloudInitPickle
- 
-         network_state = parse_net_config_data(netconfig, renderer=renderer)
-         self._write_network_state(network_state, renderer)
-+        # The sysconfig renderer has no route writing implementation
-+        # for SUSE yet use the old code for now that depends on the
-+        # raw config.
-+        try:
-+            # Only exists for SUSE distro via this patch all other
-+            # implementations throw which breaks testing
-+            self._write_routes(netconfig)
-+        except AttributeError:
-+            pass
- 
-         # Now try to bring them up
-         if bring_up:
---- cloudinit/distros/opensuse.py.orig
-+++ cloudinit/distros/opensuse.py
-@@ -10,7 +10,7 @@
- 
- import os
- 
--from cloudinit import distros, helpers
-+from cloudinit import distros, helpers, net
- from cloudinit import log as logging
- from cloudinit import subp, util
- from cloudinit.distros import rhel_util as rhutil
-@@ -238,6 +238,147 @@ class Distro(distros.Distro):
-             conf.set_hostname(hostname)
-             util.write_file(filename, str(conf), 0o644)
- 
-+    def _write_routes_v1(self, netconfig):
-+        """Write route files, not part of the standard distro interface"""
-+        # Due to the implementation of the sysconfig renderer default routes
-+        # are setup in ifcfg-* files. But this does not work on SLES or
-+        # openSUSE https://bugs.launchpad.net/cloud-init/+bug/1812117
-+        # this is a very hacky way to get around the problem until a real
-+        # solution is found in the sysconfig renderer
-+        device_configs = netconfig.get('config', [])
-+        default_nets = ('::', '0.0.0.0')
-+        for config in device_configs:
-+            if_name = config.get('name')
-+            subnets = config.get('subnets', [])
-+            config_routes = ''
-+            has_default_route = False
-+            seen_default_gateway = None
-+            for subnet in subnets:
-+                # Render the default gateway if it is present
-+                gateway = subnet.get('gateway')
-+                if gateway:
-+                    config_routes += ' '.join(
-+                        ['default', gateway, '-', '-\n']
-+                    )
-+                    has_default_route = True
-+                    if not seen_default_gateway:
-+                        seen_default_gateway = gateway
-+                # Render subnet routes
-+                routes = subnet.get('routes', [])
-+                for route in routes:
-+                    dest = route.get('destination') or route.get('network')
-+                    if not dest or dest in default_nets:
-+                        dest = 'default'
-+                        if not has_default_route:
-+                            has_default_route = True
-+                    if dest != 'default':
-+                        netmask = route.get('netmask')
-+                        if netmask:
-+                            if net.is_ipv4_network(netmask):
-+                                prefix = net.ipv4_mask_to_net_prefix(netmask)
-+                            if net.is_ipv6_network(netmask):
-+                                prefix = net.ipv6_mask_to_net_prefix(netmask)
-+                            dest += '/' + str(prefix)
-+                        if '/' not in dest:
-+                            LOG.warning(
-+                                'Skipping route; has no prefix "%s"', dest
-+                            )
-+                            continue
-+                    gateway = route.get('gateway')
-+                    if not gateway:
-+                        LOG.warning(
-+                            'Missing gateway for "%s", skipping', dest
-+                        )
-+                        continue
-+                    if (
-+                            dest == 'default'
-+                            and has_default_route
-+                            and gateway == seen_default_gateway
-+                    ):
-+                        dest_info = dest
-+                        if gateway:
-+                            dest_info = ' '.join([dest, gateway, '-', '-'])
-+                        LOG.warning(
-+                            '%s already has default route, skipping "%s"',
-+                            if_name, dest_info
-+                        )
-+                        continue
-+                    config_routes += ' '.join(
-+                        [dest, gateway, '-', '-\n']
-+                    )
-+            if config_routes:
-+                route_file = '/etc/sysconfig/network/ifroute-%s' % if_name
-+                util.write_file(route_file, config_routes)
-+
-+    def _render_route_string(self, netconfig_route):
-+        route_to = netconfig_route.get('to', None)
-+        route_via = netconfig_route.get('via', None)
-+        route_metric = netconfig_route.get('metric', None)
-+        route_string = ''
-+
-+        if route_to and route_via:
-+            route_string = ' '.join([route_to, route_via, '-', '-'])
-+            if route_metric:
-+                route_string += ' metric {}\n'.format(route_metric)
-+            else:
-+                route_string += '\n'
-+        else:
-+            LOG.warning('invalid route definition, skipping route')
-+
-+        return route_string
-+
-+    def _write_routes_v2(self, netconfig):
-+        for device_type in netconfig:
-+            if device_type == 'version':
-+                continue
-+
-+            if device_type == 'routes':
-+                # global static routes
-+                config_routes = ''
-+                for route in netconfig['routes']:
-+                    config_routes += self._render_route_string(route)
-+                if config_routes:
-+                    route_file = '/etc/sysconfig/network/routes'
-+                    util.write_file(route_file, config_routes)
-+            else:
-+                devices = netconfig[device_type]
-+                for device_name in devices:
-+                    config_routes = ''
-+                    device_config = devices[device_name]
-+                    try:
-+                        gateways = [
-+                            v for k, v in device_config.items()
-+                            if 'gateway' in k
-+                        ]
-+                        for gateway in gateways:
-+                            config_routes += ' '.join(
-+                                ['default', gateway, '-', '-\n']
-+                            )
-+                        for route in device_config.get('routes', []):
-+                            config_routes += self._render_route_string(route)
-+                        if config_routes:
-+                            route_file = \
-+                                '/etc/sysconfig/network/ifroute-{}'.format(
-+                                    device_name
-+                                )
-+                            util.write_file(route_file, config_routes)
-+                    except Exception:
-+                        # the parser above epxects another level of nesting
-+                        # which should be there in case it's properly
-+                        # formatted; if not we may get an exception on items()
-+                        pass
-+
-+    def _write_routes(self, netconfig):
-+        netconfig_ver = netconfig.get('version')
-+        if netconfig_ver == 1:
-+            self._write_routes_v1(netconfig)
-+        elif netconfig_ver == 2:
-+            self._write_routes_v2(netconfig)
-+        else:
-+            LOG.warning(
-+                'unsupported or missing netconfig version, not writing routes'
-+            )
-+
-     @property
-     def preferred_ntp_clients(self):
-         """The preferred ntp client is dependent on the version."""

pep-594-drop-pipes.patch

@@ -1,63 +0,0 @@
-From c76f9eb0df30ab7c288e5050ed1df85d132c0202 Mon Sep 17 00:00:00 2001
-From: Chad Smith <chad.smith@canonical.com>
-Date: Mon, 28 Aug 2023 10:22:04 -0600
-Subject: [PATCH] pep-594: drop deprecated pipes module import
-
-python3.11 will deprecated pipes module 3.13 will drop it from main.
-
-cloud-init only used the undocumented pipes.quote function,
-which is actually only wrapper around shlex.quote[1].
-
-Use shlex.quote instead.
-
-[1] https://github.com/python/cpython/blob/3.11/Lib/pipes.py#L64-L66
----
- cloudinit/distros/parsers/sys_conf.py     | 6 +++---
- tests/unittests/distros/test_sysconfig.py | 2 +-
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/cloudinit/distros/parsers/sys_conf.py b/cloudinit/distros/parsers/sys_conf.py
-index cb6e583e789..1d519ce4ef7 100644
---- a/cloudinit/distros/parsers/sys_conf.py
-+++ b/cloudinit/distros/parsers/sys_conf.py
-@@ -4,8 +4,8 @@
- #
- # This file is part of cloud-init. See LICENSE file for license information.
- 
--import pipes
- import re
-+import shlex
- from io import StringIO
- 
- # This library is used to parse/write
-@@ -82,7 +82,7 @@ def _quote(self, value, multiline=False):
-                 if re.search(r"[\t\r\n ]", value):
-                     if _contains_shell_variable(value):
-                         # If it contains shell variables then we likely want to
--                        # leave it alone since the pipes.quote function likes
-+                        # leave it alone since the shlex.quote function likes
-                         # to use single quotes which won't get expanded...
-                         if re.search(r"[\n\"']", value):
-                             quot_func = (
-@@ -93,7 +93,7 @@ def _quote(self, value, multiline=False):
-                                 lambda x: self._get_single_quote(x) % x
-                             )  # noqa: E731
-                     else:
--                        quot_func = pipes.quote
-+                        quot_func = shlex.quote
-         if not quot_func:
-             return value
-         return quot_func(value)
-diff --git a/tests/unittests/distros/test_sysconfig.py b/tests/unittests/distros/test_sysconfig.py
-index 9c3a2018edf..9f8d0cc8003 100644
---- a/tests/unittests/distros/test_sysconfig.py
-+++ b/tests/unittests/distros/test_sysconfig.py
-@@ -65,7 +65,7 @@ def test_parse_adjust(self):
-         conf["IPV6TO4_ROUTING"] = "blah \tblah"
-         contents2 = str(conf).strip()
-         # Should be requoted due to whitespace
--        self.assertRegex(contents2, r"IPV6TO4_ROUTING=[\']blah\s+blah[\']")
-+        self.assertRegex(contents2, r"IPV6TO4_ROUTING='blah\s+blah'")
- 
-     def test_parse_no_adjust_shell(self):
-         conf = SysConf("".splitlines())