Changeset 33665 in vbox

Timestamp:

Nov 1, 2010 4:31:56 PM (14 years ago)

Author:

vboxsync

Message:

Main-OVF: allow overwriting of the OS type; prefer the OS type from a vbox.xml, over the OVF one

File:

• trunk/src/VBox/Main/ApplianceImplImport.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ApplianceImplImport.cpp

@@ -164 +164 @@
 
             /* Guest OS type */
-            Utf8Str strOsTypeVBox,
-                    strCIMOSType = Utf8StrFmt("%RI32", (uint32_t)vsysThis.cimos);
+            Utf8Str strOsTypeVBox;
+            Utf8Str strCIMOSType = Utf8StrFmt("%RI32", (uint32_t)vsysThis.cimos);
             convertCIMOSType2VBoxOSType(strOsTypeVBox, vsysThis.cimos, vsysThis.strCimosDesc);
+            /* If there is a vbox.xml, we always prefer the ostype settings
+             * from there, cause OVF doesn't know all types VBox know. */
+            if (vsysThis.pelmVboxMachine)
+                strOsTypeVBox = pNewDesc->m->pConfig->machineUserData.strOsType;
             pNewDesc->addEntry(VirtualSystemDescriptionType_OS,
                                "",
@@ -2370 +2374 @@
      */
 
+    config.machineUserData.strOsType = stack.strOsTypeVBox;
     config.machineUserData.strDescription = stack.strDescription;