packages/cloud-init
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!84 make the same authentication behavior for arm and x86 machine

Browse Source 
From: @wanglmb 
Reviewed-by: @xiezhipeng1 
Signed-off-by: @xiezhipeng1
This commit is contained in:
openeuler-ci-bot 2022-12-15 11:01:48 +00:00 committed by Gitee
commit 4e281f2a69
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cloud-init.spec
View File

@ -1,6 +1,6 @@
Name: cloud-init Name: cloud-init
Version: 19.4 Version: 19.4
Release: 8 Release: 9
Summary: the defacto multi-distribution package that handles early initialization of a cloud instance. Summary: the defacto multi-distribution package that handles early initialization of a cloud instance.
License: ASL 2.0 or GPLv3 License: ASL 2.0 or GPLv3
URL: http://launchpad.net/cloud-init URL: http://launchpad.net/cloud-init
@ -19,6 +19,7 @@ Patch8: backport-CVE-2021-3429-write-passwords-only-to-serial-console-lock-down-
Patch9: backport-testing-add-additional-mocks-to-test_net-tests-1356.patch Patch9: backport-testing-add-additional-mocks-to-test_net-tests-1356.patch
Patch9000: Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch Patch9000: Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch
Patch9001: set-same-DI_DEFAULT_POLICY-for-aarch64-and-x86_64.patch
BuildRequires: pkgconfig(systemd) python3-devel python3-setuptools systemd BuildRequires: pkgconfig(systemd) python3-devel python3-setuptools systemd
BuildRequires: iproute python3-configobj python3-httpretty >= 0.8.14-2 BuildRequires: iproute python3-configobj python3-httpretty >= 0.8.14-2
@ -125,6 +126,9 @@ fi
%exclude /usr/share/doc/* %exclude /usr/share/doc/*
%changelog %changelog
* Sun Dec 11 2022 wanglimin<wanglimin@xfusion.com> - 19.4-9
- make the same authentication behavior for arm and x86 machine
* Thu Oct 13 2022 fuanan <fuanan3@h-partners.com> - 19.4-8 * Thu Oct 13 2022 fuanan <fuanan3@h-partners.com> - 19.4-8
- DESC:fix the changelog exception macro - DESC:fix the changelog exception macro

24
set-same-DI_DEFAULT_POLICY-for-aarch64-and-x86_64.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git a/tools/ds-identify b/tools/ds-identify
index c93d4a7..01ccb12 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -1072,7 +1072,7 @@ dscheck_OpenStack() {
# LP: #1715241 : arch other than intel are not identified properly.
case "$DI_UNAME_MACHINE" in
- i?86|x86_64) :;;
+ i?86|x86_64|aarch64) :;;
*) return ${DS_MAYBE};;
esac
@@ -1395,9 +1395,7 @@ parse_policy() {
local def=""
case "$DI_UNAME_MACHINE" in
# these have dmi data
- i?86|x86_64) def=${DI_DEFAULT_POLICY};;
- # aarch64 has dmi, but not currently used (LP: #1663304)
- aarch64) def=${DI_DEFAULT_POLICY_NO_DMI};;
+ i?86|x86_64|aarch64) def=${DI_DEFAULT_POLICY};;
*) def=${DI_DEFAULT_POLICY_NO_DMI};;
esac
local policy="$1"