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

!99 revert make the same authentication behavior for arm and x86 machine

Browse Source 
From: @tong_1001 
Reviewed-by: @xiezhipeng1 
Signed-off-by: @xiezhipeng1
This commit is contained in:
openeuler-ci-bot 2023-02-02 11:24:57 +00:00 committed by Gitee
commit b59461e1ef
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 4 additions and 26 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: 22.2 Version: 22.2
Release: 4 Release: 5
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
@ -13,7 +13,6 @@ Patch1: bugfix-cloud-init-add-os-support.patch
Patch2: bugfix-sort-requirements.patch Patch2: bugfix-sort-requirements.patch
Patch3: add-variable-to-forbid-tmp-dir.patch Patch3: add-variable-to-forbid-tmp-dir.patch
Patch4: Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch Patch4: Fix-the-error-level-logs-displayed-for-the-cloud-init-local-service.patch
Patch5: 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
@ -128,6 +127,9 @@ fi
%exclude /usr/share/doc/* %exclude /usr/share/doc/*
%changelog %changelog
* Thu Feb 02 2023 shixuantong <shixuantong1@huawei.com> - 22.2-5
- revert make the same authentication behavior for arm and x86 machine
* Sun Dec 11 2022 wanglimin<wanglimin@xfusion.com> - 22.2-4 * Sun Dec 11 2022 wanglimin<wanglimin@xfusion.com> - 22.2-4
- make the same authentication behavior for arm and x86 machine - make the same authentication behavior for arm and x86 machine

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

@ -1,24 +0,0 @@
diff --git a/tools/ds-identify b/tools/ds-identify
index b4e434c..493cd1e 100644
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -1250,7 +1250,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
@@ -1667,9 +1667,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"