From 9f0f7a69f31956d78a15e0f0949d56ed87375dc3 Mon Sep 17 00:00:00 2001 From: liuxiaoping Date: Sun, 9 Oct 2022 16:08:53 +0800 Subject: [PATCH 1/2] Modify the default configuration of ecs --- Modify-the-default-configuration-of-ecs.patch | 13 +++++++++++++ cloud-init.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 Modify-the-default-configuration-of-ecs.patch diff --git a/Modify-the-default-configuration-of-ecs.patch b/Modify-the-default-configuration-of-ecs.patch new file mode 100644 index 0000000..ff07edc --- /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 936b1fc..1d53ae4 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()")} @@ -27,6 +27,7 @@ URL: http://launchpad.net/cloud-init Source0: cloud-init-19.1.17.tgz Patch0: Enable-ipv6-network-by-default.patch +Patch1: Modify-the-default-configuration-of-ecs.patch BuildArch: noarch BuildRoot: %{_tmppath} @@ -118,6 +119,7 @@ ssh keys and to let the user run various scripts. %prep %setup -q -n cloud-init-19.1.17 %patch0 -p1 +%patch1 -p1 # Custom patches activation @@ -251,6 +253,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 -- Gitee From acc3247de86bb366a3647a8b42680b4197a59ed5 Mon Sep 17 00:00:00 2001 From: liuxiaoping Date: Wed, 12 Oct 2022 15:12:33 +0800 Subject: [PATCH 2/2] datesource_list test --- Datasource-ecs.patch | 11 +++++++++++ cloud-init.spec | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 Datasource-ecs.patch diff --git a/Datasource-ecs.patch b/Datasource-ecs.patch new file mode 100644 index 0000000..42aa750 --- /dev/null +++ b/Datasource-ecs.patch @@ -0,0 +1,11 @@ +--- 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,8 +33,6 @@ apt: + {% endif %} + + +-datasource_list: [ AliYun ] +- + # Example datasource config + datasource: + AliYun: diff --git a/cloud-init.spec b/cloud-init.spec index 1d53ae4..d5482d2 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -27,7 +27,7 @@ URL: http://launchpad.net/cloud-init Source0: cloud-init-19.1.17.tgz Patch0: Enable-ipv6-network-by-default.patch -Patch1: Modify-the-default-configuration-of-ecs.patch +Patch1: Datasource-ecs.patch BuildArch: noarch BuildRoot: %{_tmppath} @@ -264,7 +264,7 @@ fi * Thu Dec 16 2021 Mingyue Zhao - 19.1.14-1.1 - Supports non-root logins -* Fri Dec 12 2021 Mingyue Zhao - 19.1.13-1.2 +* Sun Dec 12 2021 Mingyue Zhao - 19.1.13-1.2 - Fixed the Qboot image startup link timeout problem * Wed Dec 08 2021 Mingyue Zhao - 19.1.13-1.1 -- Gitee