Changeset 94335 in vbox for trunk

Timestamp:

Mar 23, 2022 12:39:13 PM (3 years ago)

Author:

vboxsync

Message:

Main/Unattended: ​​bugref:9781. Debian live ISOs have only menu.cfg as boot menu configuration file. These are some related changes. More to come for Debian Live ISOs.

Location:

trunk/src/VBox/Main

Files:

• include/UnattendedInstaller.h (modified) (2 diffs)
• src-server/UnattendedInstaller.cpp (modified) (7 diffs)

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

@@ -533 +533 @@
      *
      * @returns COM status code
-     * @param   pEditor         Editor with the isolinux.cfg file loaded and parsed.
+     * @param   pEditor               Editor with the isolinux.cfg file loaded and parsed.
      */
     virtual HRESULT editIsoLinuxCfg(GeneralTextScript *pEditor);
@@ -594 +594 @@
      * @param   pEditor         Editor with the isolinux.cfg file loaded and parsed.
      */
-    HRESULT editDebianTxtCfg(GeneralTextScript *pEditor);
+    HRESULT editDebianMenuCfg(GeneralTextScript *pEditor);
+    /**
+     * Performs basic edits on a isolinux.cfg file.
+     *
+     * @returns COM status code
+     * @param   pEditor               Editor with the isolinux.cfg file loaded and parsed.
+     * @param   pszMenuConfigFileName Name of the menu config file to include in isolinux.txt. On Debians (at least)
+                                      it includes the kernel command line with our preseed file and command line argument.
+     */
+    virtual HRESULT editIsoLinuxCfg(GeneralTextScript *pEditor, const char *pszMenuConfigFileName);
 };
 

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

@@ -865 +865 @@
     try
     {
-        /* Don't include menu.cfg which may default (as most Debians do) to some vanilla menu item. txt.cfg has command
-         * kernel line options pointing to our preseed file. */
-        std::vector<size_t> vecLineNumbers = pEditor->findTemplate("include", RTCString::CaseInsensitive);
-        for (size_t i = 0; i < vecLineNumbers.size(); ++i)
-            if (pEditor->getContentOfLine(vecLineNumbers[i]).startsWithWord("include", RTCString::CaseInsensitive))
-            {
-                HRESULT hrc = pEditor->setContentOfLine(vecLineNumbers.at(i), "include txt.cfg");
-                if (FAILED(hrc))
-                    return hrc;
-            }
-
-
         /* Comment out 'display <filename>' directives that's used for displaying files at boot time. */
-        vecLineNumbers = pEditor->findTemplate("display", RTCString::CaseInsensitive);
+        std::vector<size_t> vecLineNumbers =  pEditor->findTemplate("display", RTCString::CaseInsensitive);
         for (size_t i = 0; i < vecLineNumbers.size(); ++i)
             if (pEditor->getContentOfLine(vecLineNumbers[i]).startsWithWord("display", RTCString::CaseInsensitive))
@@ -1007 +995 @@
                                                             RTVFS hVfsOrgIso, bool fOverwrite)
 {
-    /*
-     * The txt.cfg file used to be called isolinux.txt (ubuntu 4.10
-     * and possible others).
-     */
-    /** @todo Ubuntu 4.10 does not work, as we generate too long command lines
-     *        and the kernel crashes immediately. */
-    const char *pszIsoLinuxTxtCfg = "/isolinux/txt.cfg";
-    if (   !hlpVfsFileExists(hVfsOrgIso, pszIsoLinuxTxtCfg)
-        && hlpVfsFileExists(hVfsOrgIso, "/isolinux/isolinux.txt"))
-        pszIsoLinuxTxtCfg             = "/isolinux/isolinux.txt";
+    /* 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)
+        && hlpVfsFileExists(hVfsOrgIso, "/isolinux/menu.cfg"))
+        pszMenuConfigFileName     = "/isolinux/menu.cfg";
 
     /*
@@ -1037 +1020 @@
         /* Remove the two isolinux configure files we'll be replacing. */
         rVecArgs.append() = "isolinux/isolinux.cfg=:must-remove:";
-        rVecArgs.append().assign(&pszIsoLinuxTxtCfg[1]).append("=:must-remove:");
+        rVecArgs.append().assign(&pszMenuConfigFileName[1]).append("=:must-remove:");
 
         /* Add the replacement files. */
@@ -1046 +1029 @@
         strTxtCfg = mpParent->i_getAuxiliaryBasePath();
         strTxtCfg.append("isolinux-txt.cfg");
-        rVecArgs.append().assign(&pszIsoLinuxTxtCfg[1]).append("=").append(strTxtCfg);
+        rVecArgs.append().assign(&pszMenuConfigFileName[1]).append("=").append(strTxtCfg);
     }
     catch (std::bad_alloc &)
@@ -1060 +1043 @@
         HRESULT hrc = loadAndParseFileFromIso(hVfsOrgIso, "/isolinux/isolinux.cfg", &Editor);
         if (SUCCEEDED(hrc))
-            hrc = editIsoLinuxCfg(&Editor);
+            hrc = editIsoLinuxCfg(&Editor, RTPathFilename(pszMenuConfigFileName));
         if (SUCCEEDED(hrc))
         {
@@ -1082 +1065 @@
 
     /*
-     * Edit the txt.cfg file.
+     * Edit the menu config file file.
      */
     {
         GeneralTextScript Editor(mpParent);
-        HRESULT hrc = loadAndParseFileFromIso(hVfsOrgIso, pszIsoLinuxTxtCfg, &Editor);
+        HRESULT hrc = loadAndParseFileFromIso(hVfsOrgIso, pszMenuConfigFileName, &Editor);
         if (SUCCEEDED(hrc))
-            hrc = editDebianTxtCfg(&Editor);
+            hrc = editDebianMenuCfg(&Editor);
         if (SUCCEEDED(hrc))
         {
@@ -1115 +1098 @@
 }
 
-HRESULT UnattendedDebianInstaller::editDebianTxtCfg(GeneralTextScript *pEditor)
+HRESULT UnattendedDebianInstaller::editIsoLinuxCfg(GeneralTextScript *pEditor, const char *pszMenuConfigFileName)
+{
+    try
+    {
+        /* Include menu config file. Since it can be txt.cfg, menu.cfg or something else we need to parametrize this. */
+        if (pszMenuConfigFileName && pszMenuConfigFileName[0] != '\0')
+        {
+            std::vector<size_t> vecLineNumbers = pEditor->findTemplate("include", RTCString::CaseInsensitive);
+            for (size_t i = 0; i < vecLineNumbers.size(); ++i)
+            {
+                if (pEditor->getContentOfLine(vecLineNumbers[i]).startsWithWord("include", RTCString::CaseInsensitive))
+                {
+                    Utf8Str strIncludeLine("include ");
+                    strIncludeLine.append(pszMenuConfigFileName);
+                    HRESULT hrc = pEditor->setContentOfLine(vecLineNumbers.at(i), strIncludeLine);
+                    if (FAILED(hrc))
+                        return hrc;
+                }
+            }
+        }
+
+        /* Comment out default directives since in Debian case default is handled in menu config file. */
+        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))
+            {
+                HRESULT hrc = pEditor->prependToLine(vecLineNumbers.at(i), "#");
+                if (FAILED(hrc))
+                    return hrc;
+            }
+    }
+    catch (std::bad_alloc &)
+    {
+        return E_OUTOFMEMORY;
+    }
+    return UnattendedLinuxInstaller::editIsoLinuxCfg(pEditor);
+}
+
+HRESULT UnattendedDebianInstaller::editDebianMenuCfg(GeneralTextScript *pEditor)
 {
     /*