Changeset 43058 in vbox

Timestamp:

Aug 29, 2012 7:47:42 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

80394

Message:

VBoxManage/UpdateAdditions: Implemented --wait-start to only wait for the actual Guest Additions updater being started.

Location:

trunk

Files:

• doc/manual/en_US/user_VBoxManage.xml (modified) (3 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (4 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (1 diff)

trunk/doc/manual/en_US/user_VBoxManage.xml

@@ -649 +649 @@
 
           <listitem>
-            <para><computeroutput>--nicbootprio&lt;1-N&gt; 
-            &lt;priority&gt;</computeroutput>: This specifies the order in which 
-            NICs are tried for booting over the network (using PXE). The 
-            priority is an integer in the 0 to 4 range. Priority 1 is the 
-            highest, priority 4 is low. Priority 0, which is the default unless 
+            <para><computeroutput>--nicbootprio&lt;1-N&gt;
+            &lt;priority&gt;</computeroutput>: This specifies the order in which
+            NICs are tried for booting over the network (using PXE). The
+            priority is an integer in the 0 to 4 range. Priority 1 is the
+            highest, priority 4 is low. Priority 0, which is the default unless
             otherwise specified, is the lowest.
             </para>
@@ -3127 +3127 @@
 
           <screen>VBoxManage guestcontrol &lt;vmname&gt;|&lt;uuid&gt; updateadditions
-            [--source "&lt;guest additions .ISO file to use&gt;"] [--verbose]</screen>
+            [--source "&lt;guest additions .ISO file to use&gt;"] [--verbose]
+            [--wait-start]</screen>
 
           <para>where the parameters mean: <glosslist>
@@ -3153 +3154 @@
                 <glossdef>
                   <para>Tells VBoxManage to be more verbose.</para>
+                </glossdef>
+              </glossentry>
+
+              <glossentry>
+                <glossterm>--wait-start</glossterm>
+                <glossdef>
+                  <para>Starts the regular updating process and waits until the
+                    actual Guest Additions update inside the guest was started.
+                    This can be necessary due to needed interaction with the
+                    guest OS during the installation phase.</para>
+                  <para>When omitting this flag VBoxManage will wait for the
+                    whole Guest Additions update to complete.</para>
                 </glossdef>
               </glossentry>

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

@@ -260 +260 @@
                  "                            updateadditions\n"
                  "                            [--source <guest additions .ISO>] [--verbose]\n"
+                 "                            [--wait-start]\n"
                  "\n", pcszSep1, pcszSep2);
 }
@@ -2530 +2531 @@
     Utf8Str strSource;
     bool fVerbose = false;
+    bool fWaitStartOnly = false;
 
     static const RTGETOPTDEF s_aOptions[] =
     {
         { "--source",              's',         RTGETOPT_REQ_STRING  },
-        { "--verbose",             'v',         RTGETOPT_REQ_NOTHING }
+        { "--verbose",             'v',         RTGETOPT_REQ_NOTHING },
+        { "--wait-start",          'w',         RTGETOPT_REQ_NOTHING }
     };
 
@@ -2554 +2557 @@
             case 'v':
                 fVerbose = true;
+                break;
+
+            case 'w':
+                fWaitStartOnly = true;
                 break;
 
@@ -2592 +2599 @@
             RTPrintf("Using source: %s\n", strSource.c_str());
 
+        com::SafeArray<AdditionsUpdateFlag_T> aUpdateFlags;
+        if (fWaitStartOnly)
+        {
+            aUpdateFlags.push_back(AdditionsUpdateFlag_WaitForUpdateStartOnly);
+            if (fVerbose)
+                RTPrintf("Preparing and waiting for Guest Additions installer to start ...\n");
+        }
+
         ComPtr<IProgress> pProgress;
-
-        SafeArray<AdditionsUpdateFlag_T> updateFlags; /* No flags set. */
         CHECK_ERROR(guest, UpdateGuestAdditions(Bstr(strSource).raw(),
                                                 /* Wait for whole update process to complete. */
-                                                ComSafeArrayAsInParam(updateFlags),
+                                                ComSafeArrayAsInParam(aUpdateFlags),
                                                 pProgress.asOutParam()));
         if (FAILED(rc))

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -8907 +8907 @@
     </const>
     <const name="WaitForUpdateStartOnly"  value="1">
-      <desc>Only wait for the update process being started and do not
-        wait while peforming the actual update.</desc>
+      <desc>Starts the regular updating process and waits until the
+        actual Guest Additions update inside the guest was started. 
+        This can be necessary due to needed interaction with the guest
+        OS during the installation phase.</desc>
     </const>
   </enum>