!170 do not generate dsa

From: @tong_1001 
Reviewed-by: @gaoruoshu 
Signed-off-by: @gaoruoshu
This commit is contained in:
openeuler-ci-bot 2023-11-07 09:06:05 +00:00 committed by Gitee
commit b33eeb1daa
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 35 additions and 1 deletions

View File

@ -1,6 +1,6 @@
Name: cloud-init
Version: 23.2.2
Release: 3
Release: 4
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
@ -15,6 +15,8 @@ Patch3: add-variable-to-forbid-tmp-dir.patch
Patch4: Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch
Patch5: cloud-init-23.2.2-nm-controlled.patch
Patch9000: do-not-generate-dsa.patch
BuildRequires: pkgconfig(systemd) python3-devel python3-setuptools systemd
BuildRequires: iproute python3-configobj python3-responses
BuildRequires: python3-jinja2 python3-jsonpatch python3-jsonschema
@ -120,6 +122,12 @@ fi
%exclude /usr/share/doc/*
%changelog
* Wed Nov 01 2023 shixuantong <shixuantong1@huawei.com> - 23.2.2-4
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:do not generate dsa
* Tue Oct 10 2023 shixuantong <shixuantong1@huawei.com> - 23.2.2-3
- Type:bugfix
- ID:NA

26
do-not-generate-dsa.patch Normal file
View File

@ -0,0 +1,26 @@
From ab1a7fc06f5e6804bc44a9c55bdba197a4c89100 Mon Sep 17 00:00:00 2001
From: shixuantong <shixuantong1@huawei.com>
Date: Wed, 1 Nov 2023 17:21:45 +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 e686770..9a8a41d 100644
--- a/config/cloud.cfg.tmpl
+++ b/config/cloud.cfg.tmpl
@@ -82,6 +82,9 @@ syslog_fix_perms: ~
disable_vmware_customization: false
{% 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