Changeset 84869 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jun 18, 2020 9:33:37 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9515. Enabling unattended install (the most stripped version possible) in the new vm wizard.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIVirtualBoxManager.cpp (modified) (5 diffs)
• manager/UIVirtualBoxManager.h (modified) (1 diff)
• wizards/newvm/UIWizardNewVM.cpp (modified) (1 diff)
• wizards/newvm/UIWizardNewVM.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -29 +29 @@
 #include "UICloudProfileManager.h"
 #include "UIDesktopServices.h"
+#include "UIErrorString.h"
 #include "UIExtraDataManager.h"
 #include "UIHostNetworkManager.h"
@@ -65 +66 @@
 /* COM includes: */
 #include "CSystemProperties.h"
+#include "CUnattended.h"
+#include "CVirtualBoxErrorInfo.h"
 
 /* Other VBox stuff: */
@@ -72 +75 @@
 # include <iprt/env.h>
 #endif /* VBOX_WS_X11 */
+
+#define checkUnattendedInstallError(comUnattendedInstaller) \
+    do { \
+        if (!comUnattendedInstaller.isOk())      \
+        { \
+        COMErrorInfo comErrorInfo =  comUnattendedInstaller.errorInfo(); \
+        QString strErrorInfo = UIErrorString::formatErrorInfo(comErrorInfo); \
+        printf("unattended install error %s\n", qPrintable(strErrorInfo)); \
+        return; \
+        } \
+    } while (0)
 
 
@@ -599 +613 @@
         pWizard->exec();
 
+        /* Cache unattended install related info and delete the wizard before handling the unattended install stuff: */
+        bool fUnattendedEnabled = pWizard->isUnattendedInstallEnabled();
+        QUuid uMachineUid = pWizard->createdMachineId();
+        QString strISOPath = pWizard->unattendedISOFilePath();
+        bool fStartHeadless = pWizard->startHeadless();
 
         delete pWizard;
+        /* Handle unattended install stuff: */
+        if (fUnattendedEnabled)
+            startUnattendedInstall(uMachineUid, strISOPath, fStartHeadless);
     }
     /* For cloud machine: */
@@ -1849 +1871 @@
 }
 
+void UIVirtualBoxManager::startUnattendedInstall(const QUuid &uMachineUid, const QString &strISOPath, bool fStartHeadless)
+{
+    if (!QFileInfo(strISOPath).exists())
+    {
+        /// @todo Show a relavant error message here
+        return;
+    }
+
+    CVirtualBox comVBox = uiCommon().virtualBox();
+    CUnattended comUnattendedInstaller = comVBox.CreateUnattendedInstaller();
+    AssertMsgReturnVoid(!comUnattendedInstaller.isNull(), ("Could not create unattended installer!\n"));
+    CMachine comMachine = comVBox.FindMachine(uMachineUid.toString());
+    AssertMsgReturnVoid(!comMachine.isNull(), ("Failed to find CMachine for the uuid %u!\n", uMachineUid));
+
+    comUnattendedInstaller.SetIsoPath(strISOPath);
+    checkUnattendedInstallError(comUnattendedInstaller);
+    comUnattendedInstaller.SetMachine(comMachine);
+    checkUnattendedInstallError(comUnattendedInstaller);
+    comUnattendedInstaller.Prepare();
+    checkUnattendedInstallError(comUnattendedInstaller);
+    comUnattendedInstaller.ConstructMedia();
+    checkUnattendedInstallError(comUnattendedInstaller);
+    comUnattendedInstaller.ReconfigureVM();
+    checkUnattendedInstallError(comUnattendedInstaller);
+
+    UICommon::LaunchMode enmLaunchMode = UICommon::LaunchMode_Default;
+    if (fStartHeadless)
+        enmLaunchMode = UICommon::LaunchMode_Headless;
+    uiCommon().launchMachine(comMachine, enmLaunchMode);
+}
+
 void UIVirtualBoxManager::performStartOrShowVirtualMachines(const QList<UIVirtualMachineItem*> &items, UICommon::LaunchMode enmLaunchMode)
 {

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h

@@ -335 +335 @@
         /** Opens add machine dialog specifying initial name with @a strFileName. */
         void openAddMachineDialog(const QString &strFileName = QString());
+       /** Creates an uattended installer and uses that to install guest os to newly created vm. */
+       void startUnattendedInstall(const QUuid &uMachineUid, const QString &strISOPath, bool fStartHeadless);
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp

@@ -117 +117 @@
          * 1. if we don't attach any virtual hard-drive
          * 2. or attach a new (empty) one.
+         * 3. and if the unattended install is not enabled
          * Usually we are assigning extra-data values through UIExtraDataManager,
          * but in that special case VM was not registered yet, so UIExtraDataManager is unaware of it: */
-        if (field("virtualDiskId").toString().isNull() || !field("virtualDisk").value<CMedium>().isNull())
+        if (!isUnattendedInstallEnabled() &&
+            (field("virtualDiskId").toString().isNull() || !field("virtualDisk").value<CMedium>().isNull()))
             m_machine.SetExtraData(GUI_FirstRun, "yes");
     }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.h

@@ -59 +59 @@
     /** Returns the Id of newly created VM. */
     QUuid createdMachineId() const { return m_machine.GetId(); }
+    QString unattendedISOFilePath() const;
+    bool isUnattendedInstallEnabled() const;
+    bool startHeadless() const;
 
 protected:
@@ -72 +75 @@
     friend class UIWizardNewVMPageBasic3;
     friend class UIWizardNewVMPageExpert;
-
-    QString unattendedISOFilePath() const;
-    bool isUnattendedInstallEnabled() const;
-    bool startHeadless() const;
-
 
 private slots: