Changeset 94751 in vbox for trunk/src/VBox

Timestamp:

Apr 28, 2022 7:12:56 PM (3 years ago)

Author:

vboxsync

Message:

Main/Unattended: bugref:9781. build fix.

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

@@ -593 +593 @@
      * @returns COM status code
      * @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);
+     */
+    HRESULT editDebianMenuCfg(GeneralTextScript *pEditor);
     /**
      * Performs basic edits on grub configuration file (grub.cfg).
@@ -601 +600 @@
      * @returns COM status code
      * @param   pEditor                 Editor with the grub.cfg file loaded and parsed.
-     * @param   pszGrubConfigFileName   Name of the grub config file.
-     */
-    HRESULT editDebianGrubCfg(GeneralTextScript *pEditor, const char *pszGrubConfigFileName);
+     */
+    HRESULT editDebianGrubCfg(GeneralTextScript *pEditor);
 
     /**

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

@@ -1088 +1088 @@
         {
             if (strMenuConfigFileName.compare("/boot/grub/grub.cfg", RTCString::CaseInsensitive) == 0)
-                hrc = editDebianGrubCfg(&Editor, strMenuConfigFileName.c_str());
+                hrc = editDebianGrubCfg(&Editor);
             else
-                hrc = editDebianMenuCfg(&Editor, strMenuConfigFileName.c_str());
+                hrc = editDebianMenuCfg(&Editor);
         }
         if (SUCCEEDED(hrc))
@@ -1156 +1156 @@
 }
 
-HRESULT UnattendedDebianInstaller::editDebianMenuCfg(GeneralTextScript *pEditor, const char *pszMenuConfigFileName)
+HRESULT UnattendedDebianInstaller::editDebianMenuCfg(GeneralTextScript *pEditor)
 {
     /*
@@ -1191 +1191 @@
         }
         if (!fLabelFound)
-            hrc = VBOX_E_FILE_ERROR;
+            hrc = E_FAIL;;
 
         if (SUCCEEDED(hrc))
@@ -1214 +1214 @@
         }
         if (FAILED(hrc))
-            return mpParent->setErrorBoth(VBOX_E_FILE_ERROR, hrc,
-                                          tr("Failed to edit menu configuration file: \"%s\": (%Rrc)"),
-                                          pszMenuConfigFileName, hrc);
+            return hrc;
     }
     catch (std::bad_alloc &)
@@ -1225 +1223 @@
 }
 
-HRESULT UnattendedDebianInstaller::editDebianGrubCfg(GeneralTextScript *pEditor, const char *pszGrubConfigFileName)
+HRESULT UnattendedDebianInstaller::editDebianGrubCfg(GeneralTextScript *pEditor)
 {
     /* Default menu entry of grub.cfg is set in /etc/deafult/grub file. */
@@ -1273 +1271 @@
                     }
                     if (!fSecondWord)
-                        hrc = VBOX_E_FILE_ERROR;
+                        hrc = E_FAIL;
 
                     if (SUCCEEDED(hrc))
@@ -1291 +1289 @@
                     }
                     if (FAILED(hrc))
-                        return mpParent->setErrorBoth(VBOX_E_FILE_ERROR, hrc,
-                                                      tr("Failed to edit grub configuration file: \"%s\": (%Rrc)"),
-                                                      pszGrubConfigFileName, hrc);
+                        return hrc;
                 }
             }