revert make the same authentication behavior for arm and x86 machine

This commit is contained in:
shixuantong 2023-02-02 16:20:23 +08:00
parent 25658558c0
commit 97594579d7
2 changed files with 4 additions and 26 deletions

View File

@ -1,6 +1,6 @@
Name: cloud-init
Version: 21.4
Release: 9
Release: 10
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
@ -21,7 +21,6 @@ Patch9: backport-netplan-define-features.NETPLAN_CONFIG_ROOT_READ_ONL.patch
Patch10: backport-Fix-the-distro.osfamily-output-problem.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: iproute python3-configobj python3-httpretty >= 0.8.14-2
@ -131,6 +130,9 @@ fi
%exclude /usr/share/doc/*
%changelog
* Thu Feb 02 2023 shixuantong <shixuantong1@huawei.com> - 21.4-10
- revert make the same authentication behavior for arm and x86 machine
* Fri Jan 06 2023 shixuantong <shixuantong1@huawei.com> - 21.4-9
- Fix the distro.osfamily output problem

View File

@ -1,24 +0,0 @@
diff --git a/tools/ds-identify b/tools/ds-identify
index 30d4b0f..0611aba 100644
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -1220,7 +1220,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
@@ -1636,9 +1636,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"