diff --git a/Datasource-ecs.patch b/Datasource-ecs.patch new file mode 100644 index 0000000000000000000000000000000000000000..ec45d6af55563d39241948cf2aea286fe3b27cf7 --- /dev/null +++ b/Datasource-ecs.patch @@ -0,0 +1,22 @@ +--- cloud-init-19.1.17/config/cloud.cfg.tmpl 2022-04-11 14:34:19.000000000 +0800 ++++ cloud-init-19.1.17/config/cloud.cfg.tmpl2 2022-10-12 11:44:29.298056976 +0800 +@@ -33,14 +33,12 @@ apt: + {% endif %} + + +-datasource_list: [ AliYun ] +- + # Example datasource config +-datasource: +- AliYun: +- support_xen: false +- timeout: 5 +- max_wait: 300 ++# datasource: ++# AliYun: ++# support_xen: false ++# timeout: 5 ++# max_wait: 300 + # metadata_urls: [ 'blah.com' ] + + # The modules that run in the 'init' stage diff --git a/Modify-the-default-configuration-of-ecs.patch b/Modify-the-default-configuration-of-ecs.patch new file mode 100644 index 0000000000000000000000000000000000000000..ff07edc8df22c4c6a382de4ba0fe9a786fd3d480 --- /dev/null +++ b/Modify-the-default-configuration-of-ecs.patch @@ -0,0 +1,13 @@ +--- cloud-init-19.1.17/config/cloud.cfg.tmpl 2022-04-11 14:34:19.000000000 +0800 ++++ cloud-init-19.1.17/config/cloud.cfg.tmpl2 2022-10-09 15:58:19.113240586 +0800 +@@ -46,10 +46,6 @@ datasource: + # The modules that run in the 'init' stage + cloud_init_modules: + - migrator +-{% if variant not in ["sles","freebsd"] %} +- - source-address +-{% endif %} +- - pip-source + - seed_random + - bootcmd + - write-files diff --git a/cloud-init.spec b/cloud-init.spec index f434612d0fc0338be95bbae2210d8e0a2f702d66..4b81faa5ef9e896a70aa043c842e8f5cb6f30cff 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define use_systemd (0%{?fedora} && 0%{?fedora} >= 18) || (0%{?rhel} && 0%{?rhel} >= 7) @@ -28,6 +28,8 @@ Source0: cloud-init-19.1.17.tgz Patch0: Startup-sequence.patch Patch1: Enable-ipv6-network-by-default.patch Patch2: Alinux2-major-version.patch +Patch3: Datasource-ecs.patch +Patch4: Modify-the-default-configuration-of-ecs.patch BuildArch: noarch BuildRoot: %{_tmppath} @@ -123,6 +125,8 @@ ssh keys and to let the user run various scripts. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 +%patch4 -p1 # Custom patches activation @@ -256,6 +260,9 @@ fi %{python_sitelib}/* %changelog +* Sun Oct 09 2022 Xiaoping Liu - 19.1.17-1.0.2 +- Modify the default configuration of ecs + * Tue Jun 28 2022 Chang Gao - 19.1.17-1.0.1 - Reversion to 19.1.17 - Cancel disable network config