diff --git a/cloud-init.spec b/cloud-init.spec index aca253914e6ebd8f58235ed9545f98e60a6b61f4..b5c9233a64f2b995233a30cd8c580e501ff2168f 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -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 - 21.4-10 +- revert make the same authentication behavior for arm and x86 machine + * Fri Jan 06 2023 shixuantong - 21.4-9 - Fix the distro.osfamily output problem 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 deleted file mode 100644 index fdbfe1f8f4b3c99f890e6e3e71a4263e1b1d6b91..0000000000000000000000000000000000000000 --- a/set-same-DI_DEFAULT_POLICY-for-aarch64-and-x86_64.patch +++ /dev/null @@ -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"