diff --git a/Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch b/Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch new file mode 100644 index 0000000000000000000000000000000000000000..91064ca6ef565e18f47c49325d2eb3e797b054fa --- /dev/null +++ b/Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch @@ -0,0 +1,30 @@ +From 2009784e662c03d8d223161c003959511be31518 Mon Sep 17 00:00:00 2001 +From: yang_zhuang_zhuang +Date: Thu, 18 Mar 2021 15:16:35 +0800 +Subject: [PATCH] Fix the error-level logs displayed for the cloud-init-local service + +After cloud-init is installed,restart the host and check the status of the cloud-init-local service.The following error log is displayed:stages.py[ERROR]:Unable to render networking. +The value returned by return (util.system_info() ['variant'] in KNOWN_DISTROS) in the sysconfig.py file is not in the given list of KNOWN_DISTROS. +The actual return value is linux. + +Reference:https://bugs.almalinux.org/view.php?id=32&nbn=1 +--- + cloudinit/net/sysconfig.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py +index 0a5d481..17ba3c5 100644 +--- a/cloudinit/net/sysconfig.py ++++ b/cloudinit/net/sysconfig.py +@@ -19,7 +19,7 @@ from .network_state import ( + + LOG = logging.getLogger(__name__) + NM_CFG_FILE = "/etc/NetworkManager/NetworkManager.conf" +-KNOWN_DISTROS = ['centos', 'fedora', 'rhel', 'suse'] ++KNOWN_DISTROS = ['centos', 'fedora', 'rhel', 'suse', 'linux'] + + + def _make_header(sep='#'): +-- +1.8.3.1 + diff --git a/cloud-init.spec b/cloud-init.spec index 17b115c3afb279286b365322be59d451238af7f2..cb770ad054bcf7f7555193798211ef5f4d96c0ec 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,6 +1,6 @@ Name: cloud-init Version: 19.4 -Release: 3 +Release: 4 Summary: the defacto multi-distribution package that handles early initialization of a cloud instance. License: ASL 2.0 or GPLv3 URL: http://launchpad.net/cloud-init @@ -16,6 +16,8 @@ Patch5: add-variable-to-forbid-tmp-dir.patch Patch6: backport-CVE-2020-8631-utils-use-SystemRandom-when-generating-random-passwo.patch Patch7: backport-CVE-2020-8632-cc_set_password-increase-random-pwlength-from-9-to-2.patch +Patch9000: Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch + BuildRequires: pkgconfig(systemd) python3-devel python3-setuptools systemd BuildRequires: iproute python3-configobj python3-httpretty >= 0.8.14-2 BuildRequires: python3-jinja2 python3-jsonpatch python3-jsonschema @@ -121,6 +123,12 @@ fi %exclude /usr/share/doc/* %changelog +* Tue May 24 2021 yangzhuangzhuang - 19.4-4 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:Fix the error level logs displayed for the cloud-init-local service + * Sat May 22 2021 yangzhuangzhuang - 19.4-3 - Type:bugfix - ID:NA