Changeset 96706 in vbox for trunk

Timestamp:

Sep 12, 2022 4:42:01 PM (2 years ago)

Author:

vboxsync

Message:

Unattended: bugref:9781. Some modifications on OS detection and menu config file editing to enable unattended install for Linux Mint.

Location:

trunk/src/VBox/Main/src-server

Files:

• UnattendedImpl.cpp (modified) (2 diffs)
• UnattendedInstaller.cpp (modified) (7 diffs)

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

@@ -1408 +1408 @@
         pszOsAndVersion = RTStrStripL(pszOsAndVersion + 6);
     }
+    else if (   RTStrNICmp(pszOsAndVersion, RT_STR_TUPLE("Linux Mint")) == 0
+             && !RT_C_IS_ALNUM(pszOsAndVersion[10]))
+    {
+        *penmOsType = (VBOXOSTYPE)((*penmOsType & VBOXOSTYPE_x64) | VBOXOSTYPE_Ubuntu);
+        pszOsAndVersion = RTStrStripL(pszOsAndVersion + 10);
+    }
     else if (    (   RTStrNICmp(pszOsAndVersion, RT_STR_TUPLE("Xubuntu")) == 0
                   || RTStrNICmp(pszOsAndVersion, RT_STR_TUPLE("Kubuntu")) == 0
@@ -1455 +1461 @@
         *penmOsType = (VBOXOSTYPE)((*penmOsType & VBOXOSTYPE_x64) | VBOXOSTYPE_FedoraCore);
     else if (RTStrIStr(pszOsAndVersion, "Ubuntu") != NULL)
+        *penmOsType = (VBOXOSTYPE)((*penmOsType & VBOXOSTYPE_x64) | VBOXOSTYPE_Ubuntu);
+    else if (RTStrIStr(pszOsAndVersion, "Mint") != NULL)
         *penmOsType = (VBOXOSTYPE)((*penmOsType & VBOXOSTYPE_x64) | VBOXOSTYPE_Ubuntu);
     else if (RTStrIStr(pszOsAndVersion, "Debian"))

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

@@ -898 +898 @@
     try
     {
-        /* Set timeouts to 10 seconds. */
+        /* Set timeouts to 4 seconds. */
         std::vector<size_t> vecLineNumbers = pEditor->findTemplate("timeout", RTCString::CaseInsensitive);
         for (size_t i = 0; i < vecLineNumbers.size(); ++i)
             if (pEditor->getContentOfLine(vecLineNumbers[i]).startsWithWord("timeout", RTCString::CaseInsensitive))
             {
-                HRESULT hrc = pEditor->setContentOfLine(vecLineNumbers.at(i), "timeout 10");
+                HRESULT hrc = pEditor->setContentOfLine(vecLineNumbers.at(i), "timeout 4");
                 if (FAILED(hrc))
                     return hrc;
@@ -1017 +1017 @@
         if (hlpVfsFileExists(hVfsOrgIso, "/isolinux/menu.cfg"))
             pszMenuConfigFilename     =  "/isolinux/menu.cfg";
-
+        /* On Linux Mint 20.3, 21, and 19 (at least) there is only isolinux.cfg. */
+        else if (hlpVfsFileExists(hVfsOrgIso, "/isolinux/isolinux.cfg"))
+            pszMenuConfigFilename     =  "/isolinux/isolinux.cfg";
         /* Ubuntus 21.10+ are UEFI only. No isolinux directory. We modify grub.cfg. */
         else if (hlpVfsFileExists(hVfsOrgIso, "/boot/grub/grub.cfg"))
@@ -1058 +1060 @@
         }
 
-        /* Replace menu configuration file as well. */
-        rVecArgs.append().assign(pszMenuConfigFilename).append("=:must-remove:");
-        strTxtCfg = mpParent->i_getAuxiliaryBasePath();
-        if (fMenuConfigIsGrub)
-            strTxtCfg.append("grub.cfg");
-        else
-            strTxtCfg.append("isolinux-txt.cfg");
-        rVecArgs.append().assign(pszMenuConfigFilename).append("=").append(strTxtCfg);
+        /*
+         * Replace menu configuration file as well.
+         * Some distros (Linux Mint) has only isolinux.cfg. No menu.cfg or txt.cfg.
+         */
+        if (RTStrICmp(pszMenuConfigFilename, "/isolinux/isolinux.cfg") != 0)
+        {
+
+            /* Replace menu configuration file as well. */
+            rVecArgs.append().assign(pszMenuConfigFilename).append("=:must-remove:");
+            strTxtCfg = mpParent->i_getAuxiliaryBasePath();
+            if (fMenuConfigIsGrub)
+                strTxtCfg.append("grub.cfg");
+            else
+                strTxtCfg.append("isolinux-txt.cfg");
+            rVecArgs.append().assign(pszMenuConfigFilename).append("=").append(strTxtCfg);
+        }
     }
     catch (std::bad_alloc &)
@@ -1103 +1113 @@
     /*
      * Edit the menu config file.
-     */
+     * Some distros (Linux Mint) has only isolinux.cfg. No menu.cfg or txt.cfg.
+    */
+    if (RTStrICmp(pszMenuConfigFilename, "/isolinux/isolinux.cfg") != 0)
     {
         GeneralTextScript Editor(mpParent);
@@ -1112 +1124 @@
                 hrc = editDebianGrubCfg(&Editor);
             else
-                hrc = editDebianMenuCfg(&Editor);
+                    hrc = editDebianMenuCfg(&Editor);
             if (SUCCEEDED(hrc))
             {
@@ -1164 +1176 @@
         std::vector<size_t> vecLineNumbers =  pEditor->findTemplate("default", RTCString::CaseInsensitive);
         for (size_t i = 0; i < vecLineNumbers.size(); ++i)
-            if (pEditor->getContentOfLine(vecLineNumbers[i]).startsWithWord("default", RTCString::CaseInsensitive))
+            if (pEditor->getContentOfLine(vecLineNumbers[i]).startsWithWord("default", RTCString::CaseInsensitive)
+                && !pEditor->getContentOfLine(vecLineNumbers[i]).contains("default vesa", RTCString::CaseInsensitive))
             {
                 HRESULT hrc = pEditor->prependToLine(vecLineNumbers.at(i), "#");
@@ -1270 +1283 @@
     try
     {
-        /* Set timeouts to 10 seconds. */
+        /* Set timeouts to 4 seconds. */
         std::vector<size_t> vecLineNumbers = pEditor->findTemplate("set timeout", RTCString::CaseInsensitive);
         for (size_t i = 0; i < vecLineNumbers.size(); ++i)
             if (pEditor->getContentOfLine(vecLineNumbers[i]).startsWithWord("set timeout", RTCString::CaseInsensitive))
             {
-                HRESULT hrc = pEditor->setContentOfLine(vecLineNumbers.at(i), "set timeout=10");
+                HRESULT hrc = pEditor->setContentOfLine(vecLineNumbers.at(i), "set timeout=4");
                 if (FAILED(hrc))
                     return hrc;