Changeset 94748 in vbox for trunk/src

Timestamp:

Apr 28, 2022 6:45:41 PM (3 years ago)

Author:

vboxsync

Message:

Main/Unattended: bugref:9781. Edit grub.cfg when isolinux stuff is missing. Needed for Ubuntu 21+.

Location:

trunk/src/VBox/Main

Files:

• UnattendedTemplates/ubuntu_preseed.cfg (modified) (1 diff)
• include/UnattendedInstaller.h (modified) (1 diff)
• src-server/UnattendedImpl.cpp (modified) (1 diff)
• src-server/UnattendedInstaller.cpp (modified) (8 diffs)

trunk/src/VBox/Main/UnattendedTemplates/ubuntu_preseed.cfg

@@ +1 @@
+d-i ubiquity/use_nonfree true
+d-i ubiquity/install_oem false
+
 ### Partitioning
 d-i partman-auto/disk string /dev/sda

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

@@ -589 +589 @@
                                      RTVFS hVfsOrgIso, bool fOverwrite);
     /**
-     * Performs basic edits on menu configuration file(s) (txt.cfg or menu.cfg etc).
+     * Performs basic edits on menu configuration file(s) of isolinux (txt.cfg or menu.cfg etc).
      *
      * @returns COM status code
-     * @param   pEditor         Editor with the isolinux.cfg file loaded and parsed.
-     */
-    HRESULT editDebianMenuCfg(GeneralTextScript *pEditor);
+     * @param   pEditor                  Editor with the menu config. file loaded and parsed.
+     * @param   pszMenuConfigFileName    Name of the menu file.
+     */
+    HRESULT editDebianMenuCfg(GeneralTextScript *pEditor, const char *pszMenuConfigFileName);
+    /**
+     * Performs basic edits on grub configuration file (grub.cfg).
+     *
+     * @returns COM status code
+     * @param   pEditor                Editor with the grub.cfg file loaded and parsed.
+     * @param   pszMenuGrubFileName    Name of the grub config file.
+     */
+    HRESULT editDebianGrubCfg(GeneralTextScript *pEditor, const char *pszGrubConfigFileName);
+
     /**
      * Performs basic edits on a isolinux.cfg file.

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

@@ -3629 +3629 @@
         }
     }
-    /* Earlier than OL 6.4 cannot be installer. OL 6.x fails with unsupported hardware error (CPU family). */
+    /* Earlier than OL 6.4 cannot be installed. OL 6.x fails with unsupported hardware error (CPU family). */
     if (mEnmOsType == VBOXOSTYPE_Oracle || mEnmOsType == VBOXOSTYPE_Oracle_x64)
     {

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

@@ -996 +996 @@
 {
     /* On Debian Live ISOs (at least from 9 to 11) the there is only menu.cfg. */
-    const char *pszMenuConfigFileName = "/isolinux/txt.cfg";
-    if (   !hlpVfsFileExists(hVfsOrgIso, pszMenuConfigFileName)
+    RTCString strMenuConfigFileName("/isolinux/txt.cfg");
+    if (   !hlpVfsFileExists(hVfsOrgIso, strMenuConfigFileName.c_str())
         && hlpVfsFileExists(hVfsOrgIso, "/isolinux/menu.cfg"))
-        pszMenuConfigFileName     = "/isolinux/menu.cfg";
-
+        strMenuConfigFileName     = "/isolinux/menu.cfg";
+
+    /* Ubuntus 21.10+ are UEFI only. No isolinux directory. We modify grub.cfg. */
+    if (   !hlpVfsFileExists(hVfsOrgIso, strMenuConfigFileName.c_str())
+        && hlpVfsFileExists(hVfsOrgIso, "/boot/grub/grub.cfg"))
+        strMenuConfigFileName     = "/boot/grub/grub.cfg";
+
+    /* Check for existence of isolinux.cfg since UEFI-only ISOs do not have this file.  */
+    bool fIsoLinuxCfgExists = hlpVfsFileExists(hVfsOrgIso, "isolinux/isolinux.cfg");
     /*
      * VISO bits and filenames.
@@ -1018 +1025 @@
         rVecArgs.append() = "--dir-mode=0555";
 
-        /* Remove the two isolinux configure files we'll be replacing. */
-        rVecArgs.append() = "isolinux/isolinux.cfg=:must-remove:";
-        rVecArgs.append().assign(&pszMenuConfigFileName[1]).append("=:must-remove:");
-
-        /* Add the replacement files. */
-        strIsoLinuxCfg = mpParent->i_getAuxiliaryBasePath();
-        strIsoLinuxCfg.append("isolinux-isolinux.cfg");
-        rVecArgs.append().append("isolinux/isolinux.cfg=").append(strIsoLinuxCfg);
-
+        /* Replace the isolinux.cfg configuration file. */
+        if (fIsoLinuxCfgExists)
+        {
+            /* First remove. */
+            rVecArgs.append() = "isolinux/isolinux.cfg=:must-remove:";
+            /* Then add the modified file. */
+            strIsoLinuxCfg = mpParent->i_getAuxiliaryBasePath();
+            strIsoLinuxCfg.append("isolinux-isolinux.cfg");
+            rVecArgs.append().append("isolinux/isolinux.cfg=").append(strIsoLinuxCfg);
+        }
+
+        /* Replace menu configuration file as well. */
+        rVecArgs.append().assign(strMenuConfigFileName).append("=:must-remove:");
         strTxtCfg = mpParent->i_getAuxiliaryBasePath();
-        strTxtCfg.append("isolinux-txt.cfg");
-        rVecArgs.append().assign(&pszMenuConfigFileName[1]).append("=").append(strTxtCfg);
+        if (strMenuConfigFileName.compare("/boot/grub/grub.cfg", RTCString::CaseInsensitive) == 0)
+            strTxtCfg.append("grub.cfg");
+        else
+            strTxtCfg.append("isolinux-.cfg");
+        rVecArgs.append().assign(strMenuConfigFileName).append("=").append(strTxtCfg);
     }
     catch (std::bad_alloc &)
@@ -1037 +1051 @@
 
     /*
-     * Edit the isolinux.cfg file.
-     */
+     * Edit the isolinux.cfg file if it is there.
+     */
+    if (fIsoLinuxCfgExists)
     {
         GeneralTextScript Editor(mpParent);
         HRESULT hrc = loadAndParseFileFromIso(hVfsOrgIso, "/isolinux/isolinux.cfg", &Editor);
         if (SUCCEEDED(hrc))
-            hrc = editIsoLinuxCfg(&Editor, RTPathFilename(pszMenuConfigFileName));
+            hrc = editIsoLinuxCfg(&Editor, RTPathFilename(strMenuConfigFileName.c_str()));
         if (SUCCEEDED(hrc))
         {
@@ -1065 +1080 @@
 
     /*
-     * Edit the menu config file file.
+     * Edit the menu config file.
      */
     {
         GeneralTextScript Editor(mpParent);
-        HRESULT hrc = loadAndParseFileFromIso(hVfsOrgIso, pszMenuConfigFileName, &Editor);
+        HRESULT hrc = loadAndParseFileFromIso(hVfsOrgIso, strMenuConfigFileName.c_str(), &Editor);
         if (SUCCEEDED(hrc))
-            hrc = editDebianMenuCfg(&Editor);
+        {
+            if (strMenuConfigFileName.compare("/boot/grub/grub.cfg", RTCString::CaseInsensitive) == 0)
+                hrc = editDebianGrubCfg(&Editor, strMenuConfigFileName.c_str());
+            else
+                hrc = editDebianMenuCfg(&Editor, strMenuConfigFileName.c_str());
+        }
         if (SUCCEEDED(hrc))
         {
@@ -1136 +1156 @@
 }
 
-HRESULT UnattendedDebianInstaller::editDebianMenuCfg(GeneralTextScript *pEditor)
+HRESULT UnattendedDebianInstaller::editDebianMenuCfg(GeneralTextScript *pEditor, const char *pszMenuConfigFileName)
 {
     /*
@@ -1145 +1165 @@
     try
     {
+        HRESULT hrc = S_OK;
         const char *pszNewLabel = "VBoxUnatendedInstall";
         std::vector<size_t> vecLineNumbers = pEditor->findTemplate("label", RTCString::CaseInsensitive);
@@ -1161 +1182 @@
                 Utf8Str strNewLabel("label ");
                 strNewLabel.append(pszNewLabel);
-                HRESULT hrc = pEditor->setContentOfLine(vecLineNumbers[i], strNewLabel);
-                if (!SUCCEEDED(hrc))
-                    return hrc;
-                fLabelFound = true;
-                break;
+                hrc = pEditor->setContentOfLine(vecLineNumbers[i], strNewLabel);
+                if (SUCCEEDED(hrc))
+                {
+                    fLabelFound = true;
+                    break;
+                }
             }
         }
         if (!fLabelFound)
-            return E_FAIL;
-        /* Modify the content of default lines so that they point to label we have chosen above. */
-        Utf8Str strNewContent("default ");
-        strNewContent.append(pszNewLabel);
-
-        std::vector<size_t> vecDefaultLineNumbers = pEditor->findTemplate("default", RTCString::CaseInsensitive);
-        if (!vecDefaultLineNumbers.empty())
-        {
-            for (size_t j = 0; j < vecDefaultLineNumbers.size(); ++j)
-            {
-                HRESULT hrc = pEditor->setContentOfLine(vecDefaultLineNumbers[j], strNewContent);
+            hrc = VBOX_E_FILE_ERROR;
+
+        if (SUCCEEDED(hrc))
+        {
+            /* Modify the content of default lines so that they point to label we have chosen above. */
+            Utf8Str strNewContent("default ");
+            strNewContent.append(pszNewLabel);
+
+            std::vector<size_t> vecDefaultLineNumbers = pEditor->findTemplate("default", RTCString::CaseInsensitive);
+            if (!vecDefaultLineNumbers.empty())
+            {
+                for (size_t j = 0; j < vecDefaultLineNumbers.size(); ++j)
+                {
+                    hrc = pEditor->setContentOfLine(vecDefaultLineNumbers[j], strNewContent);
+                    if (FAILED(hrc))
+                        break;
+                }
+            }
+            /* Add a defaul label line. */
+            else
+                hrc = pEditor->appendLine(strNewContent);
+        }
+        if (FAILED(hrc))
+            return mpParent->setErrorBoth(VBOX_E_FILE_ERROR, hrc,
+                                          tr("Failed to edit menu configuration file: \"%s\": (%Rrc)"),
+                                          pszMenuConfigFileName, hrc);
+    }
+    catch (std::bad_alloc &)
+    {
+        return E_OUTOFMEMORY;
+    }
+    return UnattendedLinuxInstaller::editIsoLinuxCommon(pEditor);
+}
+
+HRESULT UnattendedDebianInstaller::editDebianGrubCfg(GeneralTextScript *pEditor, const char *pszGrubConfigFileName)
+{
+    /* Default menu entry of grub.cfg is set in /etc/deafult/grub file. */
+    try
+    {
+        /* Set timeouts to 10 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");
                 if (FAILED(hrc))
                     return hrc;
             }
-        }
-        /* Add a defaul label line. */
-        else
-        {
-            HRESULT hrc = pEditor->appendLine(strNewContent);
-            if (FAILED(hrc))
-                return hrc;
-        }
-
+
+        /* Modify kernel lines assuming that they starts with 'linux' keyword and 2nd word is the kernel command.*
+         * we remove whatever comes after command and add our own command line options. */
+        vecLineNumbers = pEditor->findTemplate("linux", RTCString::CaseInsensitive);
+        if (vecLineNumbers.size() > 0)
+        {
+            Utf8Str const &rStrAppend = mpParent->i_getExtraInstallKernelParameters().isNotEmpty()
+                                      ? mpParent->i_getExtraInstallKernelParameters()
+                                      : mStrDefaultExtraInstallKernelParameters;
+
+            for (size_t i = 0; i < vecLineNumbers.size(); ++i)
+            {
+                HRESULT hrc = S_OK;
+                if (pEditor->getContentOfLine(vecLineNumbers[i]).startsWithWord("linux", RTCString::CaseInsensitive))
+                {
+                    Utf8Str strLine = pEditor->getContentOfLine(vecLineNumbers[i]);
+                    size_t cbPos = strLine.find("linux") + strlen("linux");
+                    bool fSecondWord = false;
+                    /* Find the end of 2nd word assuming that it is kernel command. */
+                    while (cbPos < strLine.length())
+                    {
+                        if (!fSecondWord)
+                        {
+                            if (strLine[cbPos] != '\t' && strLine[cbPos] != ' ')
+                                fSecondWord = true;
+                        }
+                        else
+                        {
+                            if (strLine[cbPos] == '\t' || strLine[cbPos] == ' ')
+                                break;
+                        }
+                        ++cbPos;
+                    }
+                    if (!fSecondWord)
+                        hrc = VBOX_E_FILE_ERROR;
+
+                    if (SUCCEEDED(hrc))
+                    {
+                        strLine.erase(cbPos, strLine.length() - cbPos);
+
+                        /* Do the appending. */
+                        if (rStrAppend.isNotEmpty())
+                        {
+                            if (!rStrAppend.startsWith(" ") && !strLine.endsWith(" "))
+                                strLine.append(' ');
+                            strLine.append(rStrAppend);
+                        }
+
+                        /* Update line. */
+                        hrc = pEditor->setContentOfLine(vecLineNumbers.at(i), strLine);
+                    }
+                    if (FAILED(hrc))
+                        return mpParent->setErrorBoth(VBOX_E_FILE_ERROR, hrc,
+                                                      tr("Failed to edit grub configuration file: \"%s\": (%Rrc)"),
+                                                      pszGrubConfigFileName, hrc);
+                }
+            }
+        }
     }
     catch (std::bad_alloc &)
@@ -1197 +1302 @@
         return E_OUTOFMEMORY;
     }
-    return UnattendedLinuxInstaller::editIsoLinuxCommon(pEditor);
-}
-
+    return S_OK;
+}
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////