From 46316cf0488a8dcb3843b0192c34a1700681283e Mon Sep 17 00:00:00 2001
From: shixuantong <shixuantong1@huawei.com>
Date: Mon, 6 Nov 2023 16:44:28 +0800
Subject: [PATCH 1/2] do not generate dsa

---
 cloud-init.spec           |  9 ++++++++-
 do-not-generate-dsa.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 do-not-generate-dsa.patch

diff --git a/cloud-init.spec b/cloud-init.spec
index 9083ec7..802fb0f 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -1,6 +1,6 @@
 Name: cloud-init
 Version: 21.4
-Release: 21
+Release: 22
 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
@@ -46,6 +46,7 @@ Patch6015: backport-cc_disk_setup-pass-options-in-correct-order-to-utils.patch
 Patch6016: backport-util-add-Version-class.patch
 
 Patch9000: Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch
+Patch9001: do-not-generate-dsa.patch
 
 Patch6017: backport-cc_ubuntu_advantage-Redact-token-from-logs-1726.patch
 Patch6018: backport-Do-not-silently-ignore-integer-uid-1280.patch
@@ -179,6 +180,12 @@ fi
 %exclude /usr/share/doc/*
 
 %changelog
+* Mon Nov 06 2023 shixuantong <shixuantong1@huawei.com> - 21.4-22
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:do not generate dsa
+
 * Mon Sep 18 2023 shixuantong <shixuantong1@huawei.com> - 21.4-21
 - Type:bugfix
 - CVE:NA
diff --git a/do-not-generate-dsa.patch b/do-not-generate-dsa.patch
new file mode 100644
index 0000000..ca0d34d
--- /dev/null
+++ b/do-not-generate-dsa.patch
@@ -0,0 +1,26 @@
+From 314952210a5900aced4f2578a5f663eb21a16e77 Mon Sep 17 00:00:00 2001
+From: shixuantong <shixuantong1@huawei.com>
+Date: Mon, 6 Nov 2023 16:42:16 +0800
+Subject: [PATCH] do not generate dsa
+
+---
+ config/cloud.cfg.tmpl | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/config/cloud.cfg.tmpl b/config/cloud.cfg.tmpl
+index 4df91f1..5f0fe00 100644
+--- a/config/cloud.cfg.tmpl
++++ b/config/cloud.cfg.tmpl
+@@ -66,6 +66,9 @@ network:
+   config: disabled
+ {% endif %}
+ 
++# do not generate dsa
++ssh_genkeytypes:  ['rsa', 'ecdsa', 'ed25519']
++
+ # The modules that run in the 'init' stage
+ cloud_init_modules:
+  - migrator
+-- 
+2.33.0
+
-- 
Gitee


From ac0863023165056c29bdb0c1f890a3f39d9afaf9 Mon Sep 17 00:00:00 2001
From: shixuantong <shixuantong1@huawei.com>
Date: Mon, 6 Nov 2023 21:46:18 +0800
Subject: [PATCH 2/2] test

---
 cloud-init.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cloud-init.spec b/cloud-init.spec
index 802fb0f..6260f76 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -1,6 +1,6 @@
 Name: cloud-init
 Version: 21.4
-Release: 22
+Release: 23
 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
@@ -112,6 +112,10 @@ install -D -m 0644 %{SOURCE1} %{buildroot}/%{_tmpfilesdir}/%{name}.conf
 install -D -m 0644 tools/21-cloudinit.conf %{buildroot}/%{_sysconfdir}/rsyslog.d/21-cloudinit.conf
 
 %check
+echo -e "\n\n            ip a output               \n\n"
+ip a
+echo -e "\n\n            ip a output               \n\n"
+
 rm -f $RPM_BUILD_DIR/%{name}-%{version}/tests/unittests/test_handler/test_handler_ntp.py
 rm -f $RPM_BUILD_DIR/%{name}-%{version}/tests/unittests/test_datasource/test_opennebula.py
 
-- 
Gitee