Changeset 43030 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Aug 28, 2012 11:41:55 AM (12 years ago)

Author:

vboxsync

Message:

Main/GuestSessionImplTasks: Don't wait for Guest Additions to be ready.

File:

• trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (modified) (5 diffs)

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -900 +900 @@
 
     ComObjPtr<Guest> pGuest(mSession->getParent());
+#if 0
     /*
      * Wait for the guest being ready within 30 seconds.
@@ -922 +923 @@
         hr = setProgressErrorMsg(VBOX_E_NOT_SUPPORTED,
                                  Utf8StrFmt(GuestSession::tr("Guest Additions were not ready within time, giving up")));
-
-    eOSType osType;
+#else
+    /*
+     * For use with the GUI we don't want to wait, just return so that the manual .ISO mounting
+     * can continue.
+     */
+    AdditionsRunLevelType_T addsRunLevel;
+    if (      FAILED(hr = pGuest->COMGETTER(AdditionsRunLevel)(&addsRunLevel))
+        || (   addsRunLevel != AdditionsRunLevelType_Userland
+            && addsRunLevel != AdditionsRunLevelType_Desktop))
+    {
+        hr = setProgressErrorMsg(VBOX_E_NOT_SUPPORTED,
+                                 Utf8StrFmt(GuestSession::tr("Guest Additions not installed or ready, aborting automatic update")));
+        rc = VERR_NOT_SUPPORTED;
+    }
+#endif
+
     if (RT_SUCCESS(rc))
     {
@@ -940 +955 @@
             rc = VERR_NOT_SUPPORTED;
         }
-
+    }
+
+    eOSType osType;
+    if (RT_SUCCESS(rc))
+    {
         /*
          * Determine guest OS type and the required installer image.
@@ -1084 +1103 @@
                              *             VBox certificates. */
                             GuestProcessStartupInfo siCertUtilRem;
-                            siCertUtilRem.mName = "VirtualBox Certificate Utility";
+                            siCertUtilRem.mName = "VirtualBox Certificate Utility, removing old VirtualBox certificates";
                             siCertUtilRem.mArguments.push_back(Utf8Str("remove-trusted-publisher"));
                             siCertUtilRem.mArguments.push_back(Utf8Str("--root")); /* Add root certificate as well. */
@@ -1096 +1115 @@
                              *              recent certificates just copied over. */
                             GuestProcessStartupInfo siCertUtilAdd;
-                            siCertUtilAdd.mName = "VirtualBox Certificate Utility";
+                            siCertUtilAdd.mName = "VirtualBox Certificate Utility, installing VirtualBox certificates";
                             siCertUtilAdd.mArguments.push_back(Utf8Str("add-trusted-publisher"));
                             siCertUtilAdd.mArguments.push_back(Utf8Str("--root")); /* Add root certificate as well. */