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 index 40523d18734fcafb3a4ac03d2d7e345ec157fcbc..6d971791d196a26d05ad6746951f4607e7fc5bda 100644 --- 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 @@ -13,17 +13,18 @@ Reference:https://bugs.almalinux.org/view.php?id=32&nbn=1 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py -index 90a4eb9..443a5da 100644 +index 807dd66..34e2b12 100644 --- a/cloudinit/net/sysconfig.py +++ b/cloudinit/net/sysconfig.py -@@ -28,7 +28,7 @@ KNOWN_DISTROS = [ +@@ -26,7 +26,7 @@ KNOWN_DISTROS = [ "eurolinux", "fedora", "miraclelinux", - "openEuler", + "openeuler", + "openmandriva", "rhel", "rocky", - "suse", --- -2.33.0 +-- +2.27.0 + diff --git a/add-variable-to-forbid-tmp-dir.patch b/add-variable-to-forbid-tmp-dir.patch index abe7521ad5af1b69078dff769e608d5211945fe1..0b5637b018e1775dbe9983eaaa68ce275b158ace 100644 --- a/add-variable-to-forbid-tmp-dir.patch +++ b/add-variable-to-forbid-tmp-dir.patch @@ -11,21 +11,21 @@ Signed-off-by: chengquan 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py -index a81c1e9..e4e5fdb 100755 +index 20c2a16..c283bd9 100644 --- a/setup.py +++ b/setup.py -@@ -79,6 +79,8 @@ def read_requires(): +@@ -81,6 +81,8 @@ def read_requires(): deps = subprocess.check_output(cmd) return deps.decode("utf-8").splitlines() - + +# add variable to forbid tmp dir +num = 0 - + def render_tmpl(template, mode=None): """render template into a tmpdir under same dir as setup.py -@@ -100,7 +102,10 @@ def render_tmpl(template, mode=None): +@@ -101,7 +103,10 @@ def render_tmpl(template, mode=None): return template - + topdir = os.path.dirname(sys.argv[0]) - tmpd = tempfile.mkdtemp(dir=topdir, prefix=RENDERED_TMPD_PREFIX) + global num @@ -35,17 +35,17 @@ index a81c1e9..e4e5fdb 100755 atexit.register(shutil.rmtree, tmpd) bname = os.path.basename(template).rstrip(tmpl_ext) fpath = os.path.join(tmpd, bname) -@@ -124,6 +129,9 @@ def render_tmpl(template, mode=None): +@@ -127,6 +132,9 @@ def render_tmpl(template, mode=None): # return path relative to setup.py return os.path.join(os.path.basename(tmpd), bname) - + +def sort_files(file_list): + file_list.sort() + return file_list - + # User can set the variant for template rendering if "--distro" in sys.argv: -@@ -142,11 +150,11 @@ INITSYS_FILES = { +@@ -145,11 +153,11 @@ INITSYS_FILES = { "systemd": [ render_tmpl(f) for f in ( @@ -59,5 +59,6 @@ index a81c1e9..e4e5fdb 100755 if (is_f(f) and not is_generator(f)) ], "systemd.generators": [ --- -2.27.0 \ No newline at end of file +-- +2.27.0 + diff --git a/bugfix-cloud-init-add-os-support.patch b/bugfix-cloud-init-add-os-support.patch index 93af0145aeb8e198065c0e8244a814d9ad8a1213..6bd548b0153e19f4794f63312f175ef400f9d8b0 100644 --- a/bugfix-cloud-init-add-os-support.patch +++ b/bugfix-cloud-init-add-os-support.patch @@ -8,7 +8,7 @@ reason: add oe into distros Signed-off-by: chengquan --- cloudinit/config/cc_ntp.py | 2 +- - cloudinit/config/cc_resolv_conf.py | 2 +- + cloudinit/config/cc_resolv_conf.py | 1 + cloudinit/config/cc_rh_subscription.py | 2 +- cloudinit/config/cc_spacewalk.py | 2 +- cloudinit/config/cc_yum_add_repo.py | 2 +- @@ -19,40 +19,39 @@ Signed-off-by: chengquan systemd/cloud-init.service.tmpl | 2 +- tests/unittests/test_cli.py | 2 +- tools/render-cloudcfg | 2 +- - 12 files changed, 26 insertions(+), 14 deletions(-) + 12 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 cloudinit/distros/openeuler.py diff --git a/cloudinit/config/cc_ntp.py b/cloudinit/config/cc_ntp.py -index 3bc1d30..6b0f302 100644 +index 8ecc4eb..5c5f040 100644 --- a/cloudinit/config/cc_ntp.py +++ b/cloudinit/config/cc_ntp.py -@@ -29,7 +29,7 @@ distros = [ - "eurolinux", - "fedora", +@@ -36,7 +36,7 @@ distros = [ + "mariner", "miraclelinux", + "openbsd", - "openEuler", + "openeuler", + "openmandriva", "opensuse", "photon", - "rhel", diff --git a/cloudinit/config/cc_resolv_conf.py b/cloudinit/config/cc_resolv_conf.py -index bbf6807..845e793 100644 +index 8dbed71..38cb02a 100644 --- a/cloudinit/config/cc_resolv_conf.py +++ b/cloudinit/config/cc_resolv_conf.py -@@ -52,7 +52,7 @@ meta: MetaSchema = { - "name": "Resolv Conf", - "title": "Configure resolv.conf", - "description": MODULE_DESCRIPTION, -- "distros": ["alpine", "fedora", "opensuse", "photon", "rhel", "sles"], -+ "distros": ["alpine", "fedora", "opensuse", "photon", "rhel", "sles", "openeuler"], +@@ -63,6 +63,7 @@ meta: MetaSchema = { + "photon", + "rhel", + "sles", ++ "openeuler", + ], "frequency": PER_INSTANCE, "examples": [ - dedent( diff --git a/cloudinit/config/cc_rh_subscription.py b/cloudinit/config/cc_rh_subscription.py -index b742cb9..4d8244f 100644 +index ce88ec6..62ae07e 100644 --- a/cloudinit/config/cc_rh_subscription.py +++ b/cloudinit/config/cc_rh_subscription.py -@@ -30,7 +30,7 @@ meta: MetaSchema = { +@@ -33,7 +33,7 @@ meta: MetaSchema = { "name": "Red Hat Subscription", "title": "Register Red Hat Enterprise Linux based system", "description": MODULE_DESCRIPTION, @@ -62,10 +61,10 @@ index b742cb9..4d8244f 100644 "examples": [ dedent( diff --git a/cloudinit/config/cc_spacewalk.py b/cloudinit/config/cc_spacewalk.py -index 6820a81..d97da92 100644 +index add40c1..1ba2615 100644 --- a/cloudinit/config/cc_spacewalk.py +++ b/cloudinit/config/cc_spacewalk.py -@@ -22,7 +22,7 @@ meta: MetaSchema = { +@@ -25,7 +25,7 @@ meta: MetaSchema = { "name": "Spacewalk", "title": "Install and configure spacewalk", "description": MODULE_DESCRIPTION, @@ -75,31 +74,31 @@ index 6820a81..d97da92 100644 "examples": [ dedent( diff --git a/cloudinit/config/cc_yum_add_repo.py b/cloudinit/config/cc_yum_add_repo.py -index f735719..cc787a3 100644 +index cf81b84..eb0732a 100644 --- a/cloudinit/config/cc_yum_add_repo.py +++ b/cloudinit/config/cc_yum_add_repo.py -@@ -28,7 +28,7 @@ distros = [ - "cloudlinux", +@@ -32,7 +32,7 @@ distros = [ "eurolinux", "fedora", + "mariner", - "openEuler", + "openeuler", + "openmandriva", "photon", "rhel", - "rocky", diff --git a/cloudinit/distros/__init__.py b/cloudinit/distros/__init__.py -index b034e2c..be063c2 100644 +index 735a783..6cf618f 100644 --- a/cloudinit/distros/__init__.py +++ b/cloudinit/distros/__init__.py -@@ -46,7 +46,7 @@ OSFAMILIES = { - "eurolinux", +@@ -57,7 +57,7 @@ OSFAMILIES = { "fedora", + "mariner", "miraclelinux", - "openEuler", + "openeuler", + "openmandriva", "photon", "rhel", - "rocky", diff --git a/cloudinit/distros/openeuler.py b/cloudinit/distros/openeuler.py new file mode 100644 index 0000000..7505ca4 @@ -119,97 +118,97 @@ index 0000000..7505ca4 + +# vi: ts=4 expandtab diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl -index 6951a0e..8740752 100644 +index 0f234a7..7cad768 100644 --- a/config/cloud.cfg.tmpl +++ b/config/cloud.cfg.tmpl -@@ -33,7 +33,7 @@ disable_root: true +@@ -35,7 +35,7 @@ disable_root: true {% endif %} - {% if variant in ["almalinux", "alpine", "amazon", "centos", "cloudlinux", "eurolinux", -- "fedora", "miraclelinux", "openEuler", "rhel", "rocky", "virtuozzo"] %} -+ "fedora", "miraclelinux", "openeuler", "rhel", "rocky", "virtuozzo"] %} - {% if variant == "rhel" %} + {% if variant in ["almalinux", "alpine", "amazon", "cloudlinux", "eurolinux", +- "fedora", "miraclelinux", "openEuler", "openmandriva", "rocky", "virtuozzo"] or is_rhel %} ++ "fedora", "miraclelinux", "openeuler", "openmandriva", "rocky", "virtuozzo"] or is_rhel %} + {% if is_rhel %} mount_default_fields: [~, ~, 'auto', 'defaults,nofail,x-systemd.requires=cloud-init.service,_netdev', '0', '2'] {% else %} -@@ -125,7 +125,7 @@ cloud_config_modules: - {% if variant in ["rhel"] %} +@@ -133,7 +133,7 @@ cloud_config_modules: + {% if is_rhel %} - rh_subscription {% endif %} --{% if variant in ["rhel", "fedora", "photon"] %} -+{% if variant in ["rhel", "fedora", "photon", "openeuler"] %} - {% if variant not in ["photon"] %} +-{% if variant in ["fedora", "mariner", "openmandriva", "photon"] or is_rhel %} ++{% if variant in ["fedora", "mariner", "openmandriva", "photon", "openeuler"] or is_rhel %} + {% if variant not in ["mariner", "photon"] %} - spacewalk {% endif %} -@@ -191,7 +191,7 @@ cloud_final_modules: +@@ -198,7 +198,7 @@ cloud_final_modules: system_info: # This will affect which distro class gets used - {% if variant in ["almalinux", "alpine", "amazon", "arch", "centos", "cloudlinux", "debian", -- "eurolinux", "fedora", "freebsd", "gentoo", "netbsd", "miraclelinux", "openbsd", "openEuler", -+ "eurolinux", "fedora", "freebsd", "gentoo", "netbsd", "miraclelinux", "openbsd", "openeuler", - "photon", "rhel", "rocky", "suse", "ubuntu", "virtuozzo"] %} + {% if variant in ["almalinux", "alpine", "amazon", "arch", "cloudlinux", "debian", +- "eurolinux", "fedora", "freebsd", "gentoo", "netbsd", "mariner", "miraclelinux", "openbsd", "openEuler", ++ "eurolinux", "fedora", "freebsd", "gentoo", "netbsd", "mariner", "miraclelinux", "openbsd", "openeuler", + "openmandriva", "photon", "rocky", "suse", "ubuntu", "virtuozzo"] or is_rhel %} distro: {{ variant }} {% elif variant in ["dragonfly"] %} -@@ -245,7 +245,7 @@ system_info: +@@ -253,7 +253,7 @@ system_info: security: http://ports.ubuntu.com/ubuntu-ports ssh_svcname: ssh - {% elif variant in ["almalinux", "alpine", "amazon", "arch", "centos", "cloudlinux", "eurolinux", -- "fedora", "gentoo", "miraclelinux", "openEuler", "rhel", "rocky", "suse", "virtuozzo"] %} -+ "fedora", "gentoo", "miraclelinux", "openeuler", "rhel", "rocky", "suse", "virtuozzo"] %} + {% elif variant in ["almalinux", "alpine", "amazon", "arch", "cloudlinux", "eurolinux", +- "fedora", "gentoo", "miraclelinux", "openEuler", "openmandriva", "rocky", "suse", "virtuozzo"] or is_rhel %} ++ "fedora", "gentoo", "miraclelinux", "openeuler", "openmandriva", "rocky", "suse", "virtuozzo"] or is_rhel %} # Default user name + that default users groups (if added/used) default_user: {% if variant == "amazon" %} diff --git a/systemd/cloud-init-generator.tmpl b/systemd/cloud-init-generator.tmpl -index 6689309..12aa52f 100644 +index f8121e9..d0ef37f 100644 --- a/systemd/cloud-init-generator.tmpl +++ b/systemd/cloud-init-generator.tmpl @@ -21,7 +21,7 @@ CLOUD_SYSTEM_TARGET="/usr/lib/systemd/system/cloud-init.target" CLOUD_SYSTEM_TARGET="/lib/systemd/system/cloud-init.target" {% endif %} {% if variant in ["almalinux", "centos", "cloudlinux", "eurolinux", "fedora", -- "miraclelinux", "openEuler", "rhel", "rocky", "virtuozzo"] %} -+ "miraclelinux", "openeuler", "rhel", "rocky", "virtuozzo"] %} +- "miraclelinux", "openEuler", "openmandriva", "rhel", "rocky", "virtuozzo"] %} ++ "miraclelinux", "openeuler", "openmandriva", "rhel", "rocky", "virtuozzo"] %} dsidentify="/usr/libexec/cloud-init/ds-identify" {% else %} dsidentify="/usr/lib/cloud-init/ds-identify" diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl -index c170aef..0ec2636 100644 +index a9e180e..db044e6 100644 --- a/systemd/cloud-init.service.tmpl +++ b/systemd/cloud-init.service.tmpl @@ -13,7 +13,7 @@ After=systemd-networkd-wait-online.service After=networking.service {% endif %} {% if variant in ["almalinux", "centos", "cloudlinux", "eurolinux", "fedora", -- "miraclelinux", "openEuler", "rhel", "rocky", "virtuozzo"] %} -+ "miraclelinux", "openeuler", "rhel", "rocky", "virtuozzo"] %} +- "miraclelinux", "openEuler", "openmandriva", "rhel", "rocky", "virtuozzo"] %} ++ "miraclelinux", "openeuler", "openmandriva", "rhel", "rocky", "virtuozzo"] %} After=network.service After=NetworkManager.service {% endif %} diff --git a/tests/unittests/test_cli.py b/tests/unittests/test_cli.py -index 7846d0d..0c525dd 100644 +index dd85a1c..7ec36c1 100644 --- a/tests/unittests/test_cli.py +++ b/tests/unittests/test_cli.py -@@ -260,7 +260,7 @@ class TestCLI(test_helpers.FilesystemMockingTestCase): - "**Supported distros:** all", - "**Supported distros:** almalinux, alpine, centos, " - "cloudlinux, debian, eurolinux, fedora, miraclelinux, " -- "openEuler, opensuse, photon, rhel, rocky, sles, ubuntu, " -+ "openeuler, opensuse, photon, rhel, rocky, sles, ubuntu, " - "virtuozzo", - "**Config schema**:\n **resize_rootfs:** " - "(``true``/``false``/``noblock``)", +@@ -249,7 +249,7 @@ class TestCLI: + "**Supported distros:** almalinux, alpine, centos, " + "cloudlinux, cos, debian, eurolinux, fedora, freebsd, " + "mariner, miraclelinux, " +- "openbsd, openEuler, openmandriva, " ++ "openbsd, openeuler, openmandriva, " + "opensuse, photon, rhel, rocky, sles, ubuntu, virtuozzo", + "**Config schema**:\n **resize_rootfs:** " + "(``true``/``false``/``noblock``)", diff --git a/tools/render-cloudcfg b/tools/render-cloudcfg -index afe999e..cc9f054 100755 +index c04daea..0427474 100755 --- a/tools/render-cloudcfg +++ b/tools/render-cloudcfg -@@ -24,7 +24,7 @@ def main(): +@@ -25,7 +25,7 @@ def main(): "miraclelinux", "netbsd", "openbsd", - "openEuler", + "openeuler", + "openmandriva", "photon", "rhel", - "suse", -- 2.27.0 diff --git a/bugfix-sort-requirements.patch b/bugfix-sort-requirements.patch index dcbb03aa682b7c08c25c920e7cc882f34a43d23a..b6c12e6f33b8ebd527f6d8b924bc0fea17230da6 100644 --- a/bugfix-sort-requirements.patch +++ b/bugfix-sort-requirements.patch @@ -11,16 +11,17 @@ Signed-off-by: chengquan 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py -index a9132d2..a81c1e9 100755 +index 470dd77..20c2a16 100644 --- a/setup.py +++ b/setup.py -@@ -324,6 +324,7 @@ cmdclass = { +@@ -330,6 +330,7 @@ cmdclass = { } - + requirements = read_requires() +requirements.sort() - + setuptools.setup( name="cloud-init", --- -2.27.0 \ No newline at end of file +-- +2.27.0 + diff --git a/cloud-init-22.1-no-override-default-network.patch b/cloud-init-22.1-no-override-default-network.patch index f869ca06581208acb38026e42ad884006bc0b827..671c2637f7224498ce089e4e1736cc4a056c5dff 100644 --- a/cloud-init-22.1-no-override-default-network.patch +++ b/cloud-init-22.1-no-override-default-network.patch @@ -1,18 +1,18 @@ -From 5514d5922cbc92278868bfea587c4207619d81fc Mon Sep 17 00:00:00 2001 +From 5514d5922cbc92278868bfea587c4207619d81fc Mon Sep 17 00:00:00 2001 From: Eduardo Otubo Date: Thu, 3 Dec 2020 12:34:01 +0100 Subject: [PATCH 3/3] Don't override default network configuration - -Signed-off-by: Eduardo Otubo + + Signed-off-by: Eduardo Otubo --- cloudinit/net/sysconfig.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/cloudinit/net/sysconfig.py b/cloudinit/net/sysconfig.py -index ba85c4f..90a4eb9 100644 +index 453c052..807dd66 100644 --- a/cloudinit/net/sysconfig.py +++ b/cloudinit/net/sysconfig.py -@@ -1039,7 +1039,17 @@ class Renderer(renderer.Renderer): +@@ -1017,7 +1017,17 @@ class Renderer(renderer.Renderer): # Distros configuring /etc/sysconfig/network as a file e.g. Centos if sysconfig_path.endswith("network"): util.ensure_dir(os.path.dirname(sysconfig_path)) @@ -31,5 +31,6 @@ index ba85c4f..90a4eb9 100644 if network_state.use_ipv6: netcfg.append("NETWORKING_IPV6=yes") netcfg.append("IPV6_AUTOCONF=no") --- -2.27.0 \ No newline at end of file +-- +2.27.0 + diff --git a/cloud-init-22.2.tar.gz b/cloud-init-22.2.tar.gz deleted file mode 100644 index 9a512e142e02da95148cd04ca60bde488092e431..0000000000000000000000000000000000000000 Binary files a/cloud-init-22.2.tar.gz and /dev/null differ diff --git a/cloud-init-22.4.tar.gz b/cloud-init-22.4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b0cc9da0a488d05823d244c1c639c2ab4fb529e6 Binary files /dev/null and b/cloud-init-22.4.tar.gz differ diff --git a/cloud-init.spec b/cloud-init.spec index d147cbff409f2349cf45ffa8ccee33c4937f8255..9536f707a815f33294d93659592674b3d522a629 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,6 +1,6 @@ Name: cloud-init -Version: 22.2 -Release: 4 +Version: 22.4 +Release: 1 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 @@ -21,7 +21,7 @@ BuildRequires: python3-jinja2 python3-jsonpatch python3-jsonschema BuildRequires: python3-mock python3-oauthlib python3-prettytable BuildRequires: python3-pyserial python3-PyYAML python3-requests python3-six BuildRequires: python3-unittest2 dnf %{_vendor}-release python3-pytest passwd python3-netifaces -BuildRequires: python3-pytest-mock +BuildRequires: python3-pytest-mock python3-responses Requires: e2fsprogs iproute python3-libselinux net-tools python3-policycoreutils Requires: procps python3-configobj python3-jinja2 python3-jsonpatch xfsprogs @@ -128,6 +128,9 @@ fi %exclude /usr/share/doc/* %changelog +* Sat Jan 28 2023 shixuantong - 22.4-1 +- upgrade version to 22.4 + * Sun Dec 11 2022 wanglimin - 22.2-4 - make the same authentication behavior for arm and x86 machine diff --git a/set-same-DI_DEFAULT_POLICY-for-aarch64-and-x86_64.patch b/set-same-DI_DEFAULT_POLICY-for-aarch64-and-x86_64.patch index a33dd8778b34c940d765c3ac1f0dcd65792bfa4c..687ae32189a22a0c3ee9fa3f9636c2b055ecdcf4 100644 --- a/set-same-DI_DEFAULT_POLICY-for-aarch64-and-x86_64.patch +++ b/set-same-DI_DEFAULT_POLICY-for-aarch64-and-x86_64.patch @@ -1,8 +1,8 @@ diff --git a/tools/ds-identify b/tools/ds-identify -index b4e434c..493cd1e 100644 +index 0b9f9a8..6e72036 100755 --- a/tools/ds-identify +++ b/tools/ds-identify -@@ -1250,7 +1250,7 @@ dscheck_OpenStack() { +@@ -1260,7 +1260,7 @@ dscheck_OpenStack() { # LP: #1715241 : arch other than intel are not identified properly. case "$DI_UNAME_MACHINE" in @@ -11,7 +11,7 @@ index b4e434c..493cd1e 100644 *) return ${DS_MAYBE};; esac -@@ -1667,9 +1667,7 @@ parse_policy() { +@@ -1682,9 +1682,7 @@ parse_policy() { local def="" case "$DI_UNAME_MACHINE" in # these have dmi data @@ -22,3 +22,6 @@ index b4e434c..493cd1e 100644 *) def=${DI_DEFAULT_POLICY_NO_DMI};; esac local policy="$1" +-- +2.27.0 +