Changeset 102170 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Nov 20, 2023 10:54:22 PM (15 months ago)

Author:

vboxsync

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

160295

Message:

Main/Unattended: Changed a three uses of VBOXOSTYPE_OsTypeMask to either VBOXOSTYPE_OsMask or VBOXOSTYPE_OsFamilyMask, leaving one use. A bit risky, but the code didn't look right the way it was.

File:

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

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

@@ -573 +573 @@
         {
             rImage.mArch   = s_aArches[uArch].pszArch;
-            rImage.mOSType = (VBOXOSTYPE)(s_aArches[uArch].enmArch | (rImage.mOSType & VBOXOSTYPE_OsTypeMask));
+            rImage.mOSType = (VBOXOSTYPE)(s_aArches[uArch].enmArch | (rImage.mOSType & VBOXOSTYPE_OsMask));
         }
         else
@@ -669 +669 @@
                             if (image.mEnmOsType != VBOXOSTYPE_Unknown)
                                 image.mOSType = (VBOXOSTYPE)(  (image.mOSType & VBOXOSTYPE_ArchitectureMask)
-                                                             | (image.mEnmOsType & VBOXOSTYPE_OsTypeMask));
+                                                             | (image.mEnmOsType & VBOXOSTYPE_OsMask));
                             return;
                         }
@@ -2613 +2613 @@
     uint32_t const   idxIsoOSType = Global::getOSTypeIndexFromId(mStrDetectedOSTypeId.c_str());
     VBOXOSTYPE const enmIsoOSType = idxIsoOSType < Global::cOSTypes ? Global::sOSTypes[idxIsoOSType].osType : VBOXOSTYPE_Unknown;
-    if ((enmIsoOSType & VBOXOSTYPE_OsTypeMask) == VBOXOSTYPE_Unknown)
+    if ((enmIsoOSType & VBOXOSTYPE_OsFamilyMask) == VBOXOSTYPE_Unknown)
         return setError(E_FAIL, tr("The supplied ISO file does not contain an OS currently supported for unattended installation"));
 
@@ -3989 +3989 @@
         return S_OK;
 
+    /* Note! Includes the OS family and the distro (linux) or (part) of the
+             major OS version. Use with care. */
     const VBOXOSTYPE enmOsTypeMasked = (VBOXOSTYPE)(mEnmOsType & VBOXOSTYPE_OsTypeMask);