Changeset 93311 in vbox

Timestamp:

Jan 18, 2022 12:19:06 PM (3 years ago)

Author:

vboxsync

Message:

bugref:10182. Adding the code path necessary to parse info file of debian based distros to determine OS type and architecture. Some related GUI changes are done too.

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.h (modified) (1 diff)
• Main/src-server/UnattendedImpl.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMExpertPage.cpp

@@ -117 +117 @@
 {
     AssertReturnVoid(wizardWindow<UIWizardNewVM>());
-    m_userModifiedParameters << "GuestOSType";
+    /* Don't add GuestOSType to the set since we want to adjust os type when installation ISO changes. No matter if user
+     * has already set the os type explicitly or not: */
+    //m_userModifiedParameters << "GuestOSType";
     if (m_pNameAndSystemEditor)
         wizardWindow<UIWizardNewVM>()->setGuestOSType(m_pNameAndSystemEditor->type());
@@ -147 +149 @@
 
     if (!pWizard->detectedOSTypeId().isEmpty() && !m_userModifiedParameters.contains("GuestOSType"))
-        UIWizardNewVMNameOSTypeCommon::guessOSTypeFromName(m_pNameAndSystemEditor, pWizard->detectedOSTypeId());
+        UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(m_pNameAndSystemEditor, pWizard->detectedOSTypeId());
     pWizard->setISOFilePath(strISOPath);
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.cpp

@@ -201 +201 @@
 }
 
+bool UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(UINameAndSystemEditor *pNameAndSystemEditor, QString strDetectedOSType)
+{
+    /* Append 32 as bit-count if the name has no 64 and 32 in the name since API returns a type name with no arch bit count for 32-bit OSs: */
+    if (!strDetectedOSType.contains("32") && !strDetectedOSType.contains("64"))
+        strDetectedOSType += "32";
+
+    /* Search for a matching OS type based on the string the user typed already. */
+    for (size_t i = 0; i < RT_ELEMENTS(gs_OSTypePattern); ++i)
+    {
+        if (strDetectedOSType.contains(gs_OSTypePattern[i].pattern))
+        {
+            if (pNameAndSystemEditor)
+                pNameAndSystemEditor->setType(uiCommon().vmGuestOSType(gs_OSTypePattern[i].pcstId));
+            return true;
+        }
+    }
+    return false;
+}
+
 void UIWizardNewVMNameOSTypeCommon::composeMachineFilePath(UINameAndSystemEditor *pNameAndSystemEditor,
                                                            UIWizardNewVM *pWizard)
@@ -453 +472 @@
 
     if (!pWizard->detectedOSTypeId().isEmpty() && !m_userModifiedParameters.contains("GuestOSType"))
-        UIWizardNewVMNameOSTypeCommon::guessOSTypeFromName(m_pNameAndSystemEditor, pWizard->detectedOSTypeId());
+        UIWizardNewVMNameOSTypeCommon::guessOSTypeDetectedOSTypeString(m_pNameAndSystemEditor, pWizard->detectedOSTypeId());
     pWizard->setISOFilePath(strPath);
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMNameOSTypePage.h

@@ -35 +35 @@
 {
     bool guessOSTypeFromName(UINameAndSystemEditor *pNameAndSystemEditor, QString strNewName);
+    bool guessOSTypeDetectedOSTypeString(UINameAndSystemEditor *pNameAndSystemEditor, QString strDetectedOSType);
     bool createMachineFolder(UINameAndSystemEditor *pNameAndSystemEditor, UIWizardNewVM *pWizard);
 

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

@@ -843 +843 @@
 }
 
+/**
+ * Detects linux architecture by searching for the architecture substring in @p pszArch.
+ *
+ * @returns true if detected, false if not.
+ * @param   pszArch             The architecture string.
+ * @param   penmOsType          Where to return the arch and type on success.
+ * @param   enmBaseOsType       The base (x86) OS type to return.
+ */
+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 */ )
+    {
+        *penmOsType = (VBOXOSTYPE)(enmBaseOsType | VBOXOSTYPE_x64);
+        return true;
+    }
+
+    if (   RTStrIStr(pszArch, "x86") != NULL
+        || RTStrIStr(pszArch, "i386") != NULL
+        || RTStrIStr(pszArch, "i486") != NULL
+        || RTStrIStr(pszArch, "i586") != NULL
+        || RTStrIStr(pszArch, "i686") != NULL
+        || RTStrIStr(pszArch, "i786") != NULL
+        || RTStrIStr(pszArch, "i886") != NULL
+        || RTStrIStr(pszArch, "i986") != NULL)
+    {
+        *penmOsType = enmBaseOsType;
+        return true;
+    }
+    return false;
+}
+
 static bool detectLinuxDistroName(const char *pszOsAndVersion, VBOXOSTYPE *penmOsType, const char **ppszNext)
 {
@@ -891 +925 @@
         *penmOsType = (VBOXOSTYPE)((*penmOsType & VBOXOSTYPE_x64) | VBOXOSTYPE_Ubuntu);
         pszOsAndVersion = RTStrStripL(pszOsAndVersion + 7);
+    }
+    else if (   RTStrNICmp(pszOsAndVersion, RT_STR_TUPLE("Debian")) == 0
+             && !RT_C_IS_ALNUM(pszOsAndVersion[6]))
+    {
+        *penmOsType = (VBOXOSTYPE)((*penmOsType & VBOXOSTYPE_x64) | VBOXOSTYPE_Debian);
+        pszOsAndVersion = RTStrStripL(pszOsAndVersion + 6);
     }
     else
@@ -1000 +1040 @@
     if (RT_SUCCESS(vrc))
     {
-        RT_ZERO(*pBuf);
         size_t cchIgn;
-        RTVfsFileRead(hVfsFile, pBuf->sz, sizeof(*pBuf) - 1, &cchIgn);
-        pBuf->sz[sizeof(*pBuf) - 1] = '\0';
+        vrc = RTVfsFileRead(hVfsFile, pBuf->sz, sizeof(*pBuf) - 1, &cchIgn);
+        pBuf->sz[RT_SUCCESS(vrc) ? cchIgn : 0] = '\0';
         RTVfsFileRelease(hVfsFile);
 
@@ -1135 +1174 @@
     if (RT_SUCCESS(vrc))
     {
-        RT_ZERO(*pBuf);
         size_t cchIgn;
-        RTVfsFileRead(hVfsFile, pBuf->sz, sizeof(*pBuf) - 1, &cchIgn);
-        pBuf->sz[sizeof(*pBuf) - 1] = '\0';
+        vrc = RTVfsFileRead(hVfsFile, pBuf->sz, sizeof(*pBuf) - 1, &cchIgn);
+        pBuf->sz[RT_SUCCESS(vrc) ? cchIgn : 0] = '\0';
         RTVfsFileRelease(hVfsFile);
 
@@ -1208 +1246 @@
         {
             if (!detectLinuxArch(pszArch, penmOsType, VBOXOSTYPE_Ubuntu))
+                LogRel(("Unattended: README.diskdefines: Unknown: arch='%s'\n", pszArch));
+
+            const char *pszVersion = NULL;
+            if (detectLinuxDistroName(pszDiskName, penmOsType, &pszVersion))
+            {
+                LogRelFlow(("Unattended: README.diskdefines: version=%s\n", pszVersion));
+                try { mStrDetectedOSVersion = RTStrStripL(pszVersion); }
+                catch (std::bad_alloc &) { return E_OUTOFMEMORY; }
+            }
+            else
+                LogRel(("Unattended: README.diskdefines: Unknown: diskname='%s'\n", pszDiskName));
+        }
+        else
+            LogRel(("Unattended: README.diskdefines: Did not find both DISKNAME and ARCH. :-/\n"));
+
+        if (*penmOsType != VBOXOSTYPE_Unknown)
+            return S_FALSE;
+    }
+
+    /*
+     * All of the debian based distro versions I checked have a single line ./disk/info file.
+     * Only info I could find related to .disk folder is: https://lists.debian.org/debian-cd/2004/01/msg00069.html
+     * Some example content from several install ISOs is as follows:
+     * Ubuntu 4.10 "Warty Warthog" - Preview amd64 Binary-1 (20041020)
+     * Linux Mint 20.3 "Una" - Release amd64 20220104
+     * Debian GNU/Linux 11.2.0 "Bullseye" - Official amd64 NETINST 20211218-11:12
+     * Debian GNU/Linux 9.13.0 "Stretch" - Official amd64 DVD Binary-1 20200718-11:07
+     * Xubuntu 20.04.2.0 LTS "Focal Fossa" - Release amd64 (20210209.1)
+     * Ubuntu 17.10 "Artful Aardvark" - Release amd64 (20180105.1)
+     * Ubuntu 16.04.6 LTS "Xenial Xerus" - Release i386 (20190227.1)
+     * Debian GNU/Linux 8.11.1 "Jessie" - Official amd64 CD Binary-1 20190211-02:10
+     * Kali GNU/Linux 2021.3a "Kali-last-snapshot" - Official amd64 BD Binary-1 with firmware 20211015-16:55
+     */
+    vrc = RTVfsFileOpen(hVfsIso, ".disk/info", RTFILE_O_READ | RTFILE_O_DENY_NONE | RTFILE_O_OPEN, &hVfsFile);
+    if (RT_SUCCESS(vrc))
+    {
+        size_t cchIgn;
+        vrc = RTVfsFileRead(hVfsFile, pBuf->sz, sizeof(*pBuf) - 1, &cchIgn);
+        pBuf->sz[RT_SUCCESS(vrc) ? cchIgn : 0] = '\0';
+
+        pBuf->sz[sizeof(*pBuf) - 1] = '\0';
+        RTVfsFileRelease(hVfsFile);
+
+        char *psz         = pBuf->sz;
+        char *pszDiskName = psz;
+        char *pszArch     = NULL;
+
+        /* Only care about the first line of the file even if it is multi line and assume disk name ended with ' - '.*/
+        psz = RTStrStr(pBuf->sz, " - ");
+        if (psz && memchr(pBuf->sz, '\n', (size_t)(psz - pBuf->sz)) == NULL)
+        {
+            *psz = '\0';
+            psz += 3;
+            if (*psz)
+                pszArch = psz;
+        }
+
+        if (pszDiskName && pszArch)
+        {
+            if (!detectLinuxArchII(pszArch, penmOsType, VBOXOSTYPE_Ubuntu))
                 LogRel(("Unattended: README.diskdefines: Unknown: arch='%s'\n", pszArch));
 
@@ -3116 +3214 @@
     return false;
 }
-