From 5b75dac3c43ccb91ee02a77ee4108ae42eb9af55 Mon Sep 17 00:00:00 2001 From: wanglimin Date: Fri, 16 Dec 2022 09:00:47 +0800 Subject: [PATCH] make the same authentication behavior for arm and x86 machine --- cloud-init.spec | 8 +++++-- ...EFAULT_POLICY-for-aarch64-and-x86_64.patch | 24 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 set-same-DI_DEFAULT_POLICY-for-aarch64-and-x86_64.patch diff --git a/cloud-init.spec b/cloud-init.spec index 058da23..af5eb3e 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,6 +1,6 @@ Name: cloud-init Version: 19.4 -Release: 6 +Release: 7 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 @@ -18,6 +18,7 @@ Patch7: backport-CVE-2020-8632-cc_set_password-increase-random-pwlength-from-9-t Patch8: backport-CVE-2021-3429-write-passwords-only-to-serial-console-lock-down-clo.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 @@ -124,6 +125,9 @@ fi %exclude /usr/share/doc/* %changelog +* Sun Dec 11 2022 wanglimin - 19.4-7 +- make the same authentication behavior for arm and x86 machine + * Sat Dec 4 2021 yangzhuangzhuang - 19.4-6 - Type:bugfix - ID:NA @@ -173,7 +177,7 @@ fi - Type:bugfix - ID:NA - SUG:NA -- DESC:fix %postun marco and change OS realease +- DESC:fix postun marco and change OS realease * Tue Oct 22 2019 openEuler Buildteam - 17.1-9 - Package rebuild. diff --git a/set-same-DI_DEFAULT_POLICY-for-aarch64-and-x86_64.patch b/set-same-DI_DEFAULT_POLICY-for-aarch64-and-x86_64.patch new file mode 100644 index 0000000..490fa40 --- /dev/null +++ b/set-same-DI_DEFAULT_POLICY-for-aarch64-and-x86_64.patch @@ -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" -- Gitee