Changeset 96657 in vbox

Timestamp:

Sep 8, 2022 12:47:58 PM (2 years ago)

Author:

vboxsync

Message:

Unattended: bugref:9781. Some fixes to make unattended install work with Kubuntu 20.04 and Kubuntu 22.04.

Location:

trunk/src/VBox/Main

Files:

• include/UnattendedInstaller.h (modified) (1 diff)
• src-server/UnattendedInstaller.cpp (modified) (4 diffs)

trunk/src/VBox/Main/include/UnattendedInstaller.h

@@ -622 +622 @@
      */
     virtual HRESULT editIsoLinuxCfg(GeneralTextScript *pEditor, const char *pszMenuConfigFileName);
+
+private:
+
+    /**
+     * Tries to set label name of a label line.
+     *
+     * @returns                 true if label line is found and label name can be set.
+     * @param   pEditor         Editor with the menu configuration file loaded and parsed.
+     * @param   vecLineNumbers  Indices of the label lines (within pEditor data).
+     * @param   pszKeyWord      The keyword searched within the original label name.
+     * @param   pszNewLabelName The new name of the label.
+     */
+    bool modifyLabelLine(GeneralTextScript *pEditor, const std::vector<size_t> &vecLineNumbers,
+                         const char *pszKeyWord, const char *pszNewLabelName);
 };
 

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

@@ -1170 +1170 @@
                     return hrc;
             }
+
+        /* Comment out "ui gfxboot bootlogo" line as it somehow messes things up on Kubuntu 20.04 (possibly others as well). */
+        vecLineNumbers =  pEditor->findTemplate("ui gfxboot", RTCString::CaseInsensitive);
+        for (size_t i = 0; i < vecLineNumbers.size(); ++i)
+            if (pEditor->getContentOfLine(vecLineNumbers[i]).startsWithWord("ui gfxboot", RTCString::CaseInsensitive))
+            {
+                HRESULT hrc = pEditor->prependToLine(vecLineNumbers.at(i), "#");
+                if (FAILED(hrc))
+                    return hrc;
+            }
     }
     catch (std::bad_alloc &)
@@ -1183 +1193 @@
      * Unlike Redhats, Debian variants define boot menu not in isolinux.cfg but some other
      * menu configuration files. They are mostly called txt.cfg and/or menu.cfg (and possibly some other names)
-     * In this functions we attempt to set menu's default label (default menu item) to the one containing the word 'install'.
+     * In this functions we attempt to set menu's default label (default menu item) to the one containing the word 'install',
+     * failing to find such a label (on Kubuntu 20.04 for example) we pick the first label with name 'live'.
      */
     try
     {
         HRESULT hrc = S_OK;
-        const char *pszNewLabel = "VBoxUnatendedInstall";
         std::vector<size_t> vecLineNumbers = pEditor->findTemplate("label", RTCString::CaseInsensitive);
-        bool fLabelFound = false;
-        for (size_t i = 0; i < vecLineNumbers.size(); ++i)
-        {
-            RTCString const &rContent = pEditor->getContentOfLine(vecLineNumbers[i]);
-            /* Skip this line if it does not start with the word 'label'. */
-            if (!RTStrIStartsWith(rContent.c_str(), "label"))
-                continue;
-            /* Use the first menu item starting with word label and includes the word 'install'.*/
-            if (RTStrIStr(rContent.c_str(), "install") != NULL)
-            {
-                /* Set the content of the line. It looks like multiple word labels (like label Debian Installer)
-                 * does not work very well in some cases. */
-                Utf8Str strNewLabel("label ");
-                strNewLabel.append(pszNewLabel);
-                hrc = pEditor->setContentOfLine(vecLineNumbers[i], strNewLabel);
-                if (SUCCEEDED(hrc))
-                {
-                    fLabelFound = true;
-                    break;
-                }
-            }
-        }
+        const char *pszNewLabelName = "VBoxUnatendedInstall";
+        bool fLabelFound = modifyLabelLine(pEditor, vecLineNumbers, "install", pszNewLabelName);
+        if (!fLabelFound)
+            fLabelFound = modifyLabelLine(pEditor, vecLineNumbers, "live", pszNewLabelName);
+
         if (!fLabelFound)
             hrc = E_FAIL;;
@@ -1219 +1212 @@
             /* Modify the content of default lines so that they point to label we have chosen above. */
             Utf8Str strNewContent("default ");
-            strNewContent.append(pszNewLabel);
+            strNewContent.append(pszNewLabelName);
 
             std::vector<size_t> vecDefaultLineNumbers = pEditor->findTemplate("default", RTCString::CaseInsensitive);
@@ -1243 +1236 @@
     }
     return UnattendedLinuxInstaller::editIsoLinuxCommon(pEditor);
+}
+
+bool UnattendedDebianInstaller::modifyLabelLine(GeneralTextScript *pEditor, const std::vector<size_t> &vecLineNumbers,
+                                                const char *pszKeyWord, const char *pszNewLabelName)
+{
+    if (!pEditor)
+        return false;
+    Utf8Str strNewLabel("label ");
+    strNewLabel.append(pszNewLabelName);
+    HRESULT hrc = S_OK;
+    for (size_t i = 0; i < vecLineNumbers.size(); ++i)
+    {
+        RTCString const &rContent = pEditor->getContentOfLine(vecLineNumbers[i]);
+        /* Skip this line if it does not start with the word 'label'. */
+        if (!RTStrIStartsWith(rContent.c_str(), "label"))
+            continue;
+        /* Use the first menu item starting with word label and includes pszKeyWord.*/
+        if (RTStrIStr(rContent.c_str(), pszKeyWord) != NULL)
+        {
+            /* Set the content of the line. It looks like multiple word labels (like label Debian Installer)
+             * does not work very well in some cases. */
+            hrc = pEditor->setContentOfLine(vecLineNumbers[i], strNewLabel);
+            if (SUCCEEDED(hrc))
+                return true;
+        }
+    }
+    return false;
 }