From d796441a1dca0b15f53654d26fbcafe76b77e7e1 Mon Sep 17 00:00:00 2001 From: liuxiaoping Date: Sun, 9 Oct 2022 17:51:41 +0800 Subject: [PATCH 1/4] 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 f434612..9c520eb 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,7 @@ Source0: cloud-init-19.1.17.tgz Patch0: Startup-sequence.patch Patch1: Enable-ipv6-network-by-default.patch Patch2: Alinux2-major-version.patch +Patch3: Modify-the-default-configuration-of-ecs.patch BuildArch: noarch BuildRoot: %{_tmppath} @@ -123,6 +124,7 @@ ssh keys and to let the user run various scripts. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Custom patches activation @@ -256,6 +258,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 3db0532b04e1ad1c432ecab3e238b59be70d3ed0 Mon Sep 17 00:00:00 2001 From: liuxiaoping Date: Wed, 12 Oct 2022 15:51:15 +0800 Subject: [PATCH 2/4] cloud-init test anolis7 --- Datasource-ecs.patch | 11 +++++++++++ cloud-init.spec | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) 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 9c520eb..afaee2d 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -28,7 +28,7 @@ Source0: cloud-init-19.1.17.tgz Patch0: Startup-sequence.patch Patch1: Enable-ipv6-network-by-default.patch Patch2: Alinux2-major-version.patch -Patch3: Modify-the-default-configuration-of-ecs.patch +Patch3: Datasource-ecs.patch BuildArch: noarch BuildRoot: %{_tmppath} -- Gitee From 5c0c536be965fbbbce96a36c57ff7b361203dcce Mon Sep 17 00:00:00 2001 From: liuxiaoping Date: Wed, 12 Oct 2022 16:30:34 +0800 Subject: [PATCH 3/4] test2 --- Datasource-ecs.patch | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/Datasource-ecs.patch b/Datasource-ecs.patch index 42aa750..ec45d6a 100644 --- a/Datasource-ecs.patch +++ b/Datasource-ecs.patch @@ -1,11 +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,8 +33,6 @@ apt: +@@ -33,14 +33,12 @@ apt: {% endif %} -datasource_list: [ AliYun ] - # Example datasource config - datasource: - AliYun: +-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 -- Gitee From 2b182e5fb963c080fb27f871025f59e44c5d7f01 Mon Sep 17 00:00:00 2001 From: liuxiaoping Date: Wed, 12 Oct 2022 17:01:40 +0800 Subject: [PATCH 4/4] datesource test2 --- cloud-init.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cloud-init.spec b/cloud-init.spec index afaee2d..4b81faa 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -29,6 +29,7 @@ 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} @@ -125,6 +126,7 @@ ssh keys and to let the user run various scripts. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 # Custom patches activation -- Gitee