Changeset 95156 in vbox

Timestamp:

Jun 1, 2022 8:19:53 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

151652

Message:

Main/Unattended: bugref:9781. Use VBOXOSTYPE_OsTypeMask for distro name checking.

File:

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

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

@@ -3627 +3627 @@
     }
     /* We cannot install Ubuntus older than 11.04. */
-    if (mEnmOsType == VBOXOSTYPE_Ubuntu || mEnmOsType == VBOXOSTYPE_Ubuntu_x64)
+    if ((mEnmOsType & VBOXOSTYPE_OsTypeMask) == VBOXOSTYPE_Ubuntu)
     {
         if (RTStrVersionCompare(mStrDetectedOSVersion.c_str(), "11.04") < 0)
@@ -3636 +3636 @@
     }
     /* Earlier than OL 6.4 cannot be installed. OL 6.x fails with unsupported hardware error (CPU family). */
-    if (mEnmOsType == VBOXOSTYPE_Oracle || mEnmOsType == VBOXOSTYPE_Oracle_x64)
+    if ((mEnmOsType & VBOXOSTYPE_OsTypeMask) == VBOXOSTYPE_Oracle)
     {
         if (RTStrVersionCompare(mStrDetectedOSVersion.c_str(), "6.4") < 0)
@@ -3645 +3645 @@
     }
     /* Old Debians fail since package repos have been move to some other mirror location. */
-    if (mEnmOsType == VBOXOSTYPE_Debian || mEnmOsType == VBOXOSTYPE_Debian_x64)
+    if ((mEnmOsType & VBOXOSTYPE_OsTypeMask) == VBOXOSTYPE_Debian)
     {
         if (RTStrVersionCompare(mStrDetectedOSVersion.c_str(), "9.0") < 0)