From 4140ea99f292ea74726243f83729eece6db61ffe Mon Sep 17 00:00:00 2001
From: wanglimin <wanglimin@xfusion.com>
Date: Fri, 16 Dec 2022 09:31:29 +0800
Subject: [PATCH] make the same authentication behavior for arm and x86 machine

---
 cloud-init.spec                               |  6 ++++-
 ...EFAULT_POLICY-for-aarch64-and-x86_64.patch | 24 +++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)
 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 8327626..fd2c08f 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -1,6 +1,6 @@
 Name: cloud-init
 Version: 22.1
-Release: 1
+Release: 2
 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
@@ -16,6 +16,7 @@ Patch4: backport-add-Requires-cloud-init-hotplugd.socket-in-cloud-init-hotplugd.
 Patch5: 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
@@ -125,6 +126,9 @@ fi
 %exclude /usr/share/doc/*
 
 %changelog
+* Sun Dec 11 2022 wanglimin<wanglimin@xfusion.com> - 22.1-2
+- make the same authentication behavior for arm and x86 machine
+
 * Sat Apr 2 2022 yangzhuangzhuang <yangzhuangzhuang1@h-partners.com> - 22.1-1
 - Type:update
 - ID:NA
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..c110431
--- /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 794a96f..0dbf553 100644
+--- a/tools/ds-identify
++++ b/tools/ds-identify
+@@ -1221,7 +1221,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
+ 
+@@ -1637,9 +1637,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