Changeset 93358 in vbox for trunk/src/VBox/Main

Timestamp:

Jan 20, 2022 11:18:59 AM (3 years ago)

Author:

vboxsync

Message:

Reverting r149411: Main/UnattendedImpl: ​bugref:10182. Adding the string aarch64 to linux architecture detection code. Needed to detect arch. of OL 7.8 Server for example.

File:

• trunk/src/VBox/Main/src-server/UnattendedImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/src-server/UnattendedImpl.cpp

@@ -817 +817 @@
 static bool detectLinuxArch(const char *pszArch, VBOXOSTYPE *penmOsType, VBOXOSTYPE enmBaseOsType)
 {
-    if (   RTStrNICmp(pszArch, RT_STR_TUPLE("amd64"))   == 0
-        || RTStrNICmp(pszArch, RT_STR_TUPLE("x86_64"))  == 0
-        || RTStrNICmp(pszArch, RT_STR_TUPLE("x86-64"))  == 0 /* just in case */
-        || RTStrNICmp(pszArch, RT_STR_TUPLE("x64"))     == 0 /* ditto */
-        || RTStrNICmp(pszArch, RT_STR_TUPLE("aarch64")) == 0 /* as seen in OL 7.8 Server */)
+    if (   RTStrNICmp(pszArch, RT_STR_TUPLE("amd64"))  == 0
+        || RTStrNICmp(pszArch, RT_STR_TUPLE("x86_64")) == 0
+        || RTStrNICmp(pszArch, RT_STR_TUPLE("x86-64")) == 0 /* just in case */
+        || RTStrNICmp(pszArch, RT_STR_TUPLE("x64"))    == 0 /* ditto */ )
     {
         *penmOsType = (VBOXOSTYPE)(enmBaseOsType | VBOXOSTYPE_x64);
@@ -854 +853 @@
 static bool detectLinuxArchII(const char *pszArch, VBOXOSTYPE *penmOsType, VBOXOSTYPE enmBaseOsType)
 {
-    if (   RTStrIStr(pszArch, "amd64")   != NULL
-        || RTStrIStr(pszArch, "x86_64")  != NULL
-        || RTStrIStr(pszArch, "x86-64")  != NULL /* just in case */
-        || RTStrIStr(pszArch, "x64")     != NULL /* ditto */
-        || RTStrIStr(pszArch, "aarch64") != NULL /* as seen in OL 7.8 Server */)
+    if (   RTStrIStr(pszArch, "amd64")  != NULL
+        || RTStrIStr(pszArch, "x86_64") != NULL
+        || RTStrIStr(pszArch, "x86-64") != NULL /* just in case */
+        || RTStrIStr(pszArch, "x64")    != NULL /* ditto */ )
     {
         *penmOsType = (VBOXOSTYPE)(enmBaseOsType | VBOXOSTYPE_x64);