diff --git a/cloud-init.spec b/cloud-init.spec index bc48974661e24de0492cb67235be6537fbbc1b23..532b269a745789c244c6d9f21f6272df6388de29 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -1,6 +1,6 @@ Name: cloud-init Version: 19.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 @@ -19,7 +19,6 @@ 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 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 @@ -126,6 +125,9 @@ fi %exclude /usr/share/doc/* %changelog +* Thu Feb 02 2023 shixuantong - 19.4-10 +- revert make the same authentication behavior for arm and x86 machine + * Sun Dec 11 2022 wanglimin - 19.4-9 - make the same authentication behavior for arm and x86 machine 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 490fa40020151319de61bae39371527e7380b64c..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 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"