Index: /trunk/doc/manual/en_US/SDKRef.xml =================================================================== --- /trunk/doc/manual/en_US/SDKRef.xml (revision 46523) +++ /trunk/doc/manual/en_US/SDKRef.xml (revision 46524) @@ -3644,4 +3644,12 @@ the host. + + + The parameter list for was modified. + It now supports specifying optional command line arguments for the + Guest Additions installer performing the actual update on the guest. + Index: /trunk/doc/manual/en_US/user_VBoxManage.xml =================================================================== --- /trunk/doc/manual/en_US/user_VBoxManage.xml (revision 46523) +++ /trunk/doc/manual/en_US/user_VBoxManage.xml (revision 46524) @@ -3216,5 +3216,5 @@ VBoxManage guestcontrol <vmname>|<uuid> updateadditions [--source "<guest additions .ISO file to use>"] [--verbose] - [--wait-start] + [--wait-start] [-- [<argument1>] ... [<argumentN>]] where the parameters mean: @@ -3254,4 +3254,16 @@ When omitting this flag VBoxManage will wait for the whole Guest Additions update to complete. + + + + + [-- [<argument1s>] ... [<argumentNs>]] + + + Optional command line arguments to use for the Guest Additions + installer. Useful for retrofitting features which weren't installed + before on the guest. + Arguments containing spaces must be enclosed in + quotation marks. Index: /trunk/doc/manual/user_ChangeLogImpl.xml =================================================================== --- /trunk/doc/manual/user_ChangeLogImpl.xml (revision 46523) +++ /trunk/doc/manual/user_ChangeLogImpl.xml (revision 46524) @@ -38,4 +38,9 @@ media, and support the --long option to show really all available details + + + + VBoxManage: added support for optional command line parameters for + the automatic Guest Additions update. Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (revision 46523) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (revision 46524) @@ -261,4 +261,5 @@ " [--source ] [--verbose]\n" " [--wait-start]\n" + " [-- [] ... []]\n" "\n", pcszSep1, pcszSep2); } @@ -633,6 +634,6 @@ com::SafeArray aCreateFlags; com::SafeArray aWaitFlags; - com::SafeArray args; - com::SafeArray env; + com::SafeArray aArgs; + com::SafeArray aEnv; Utf8Str strUsername; Utf8Str strPassword; @@ -669,5 +670,5 @@ return errorSyntax(USAGE_GUESTCONTROL, "Failed to parse environment value, rc=%Rrc", vrc); for (int j = 0; j < cArgs; j++) - env.push_back(Bstr(papszArg[j]).raw()); + aEnv.push_back(Bstr(papszArg[j]).raw()); RTGetOptArgvFree(papszArg); @@ -742,8 +743,8 @@ case VINF_GETOPT_NOT_OPTION: { - if (args.size() == 0 && strCmd.isEmpty()) + if (aArgs.size() == 0 && strCmd.isEmpty()) strCmd = ValueUnion.psz; else - args.push_back(Bstr(ValueUnion.psz).raw()); + aArgs.push_back(Bstr(ValueUnion.psz).raw()); break; } @@ -837,6 +838,6 @@ ComPtr pProcess; rc = pGuestSession->ProcessCreate(Bstr(strCmd).raw(), - ComSafeArrayAsInParam(args), - ComSafeArrayAsInParam(env), + ComSafeArrayAsInParam(aArgs), + ComSafeArrayAsInParam(aEnv), ComSafeArrayAsInParam(aCreateFlags), cMsTimeout, @@ -2652,4 +2653,5 @@ */ Utf8Str strSource; + com::SafeArray aArgs; bool fVerbose = false; bool fWaitStartOnly = false; @@ -2684,4 +2686,13 @@ fWaitStartOnly = true; break; + + case VINF_GETOPT_NOT_OPTION: + { + if (aArgs.size() == 0 && strSource.isEmpty()) + strSource = ValueUnion.psz; + else + aArgs.push_back(Bstr(ValueUnion.psz).raw()); + break; + } default: @@ -2731,4 +2742,5 @@ ComPtr pProgress; CHECK_ERROR(guest, UpdateGuestAdditions(Bstr(strSource).raw(), + ComSafeArrayAsInParam(aArgs), /* Wait for whole update process to complete. */ ComSafeArrayAsInParam(aUpdateFlags), Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp =================================================================== --- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (revision 46523) +++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (revision 46524) @@ -490,6 +490,8 @@ #else CGuest guest = session().GetConsole().GetGuest(); - QVector flagsUpdate; - CProgress progressInstall = guest.UpdateGuestAdditions(strSource, flagsUpdate); + QVector aFlagsUpdate; + QVector aArgs; + CProgress progressInstall = guest.UpdateGuestAdditions(strSource, + aArgs, aFlagsUpdate); bool fResult = guest.isOk(); if (fResult) Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl =================================================================== --- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 46523) +++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 46524) @@ -8582,5 +8582,5 @@ - Specifies the logging level in current use by VirtualBox. + Specifies the logging level in current use by VirtualBox. @@ -11206,5 +11206,5 @@ @@ -11699,5 +11699,12 @@ - Path to the Guest Additions .ISO file to use for the upate. + Path to the Guest Additions .ISO file to use for the update. + + + + + Optional command line arguments to use for the Guest Additions + installer. Useful for retrofitting features which weren't installed + before on the guest. @@ -20355,5 +20362,5 @@ - + arguments(ComSafeArrayInArg(aArguments)); + for (size_t i = 0; i < arguments.size(); i++) + aArgs.push_back(Utf8Str(arguments[i])); + } + catch(std::bad_alloc &) + { + rc = VERR_NO_MEMORY; + } } @@ -154,5 +172,6 @@ ComObjPtr pSession; - int rc = sessionCreate(startupInfo, guestCreds, pSession); + if (RT_SUCCESS(rc)) + rc = sessionCreate(startupInfo, guestCreds, pSession); if (RT_FAILURE(rc)) { @@ -188,5 +207,5 @@ ComObjPtr pProgress; SessionTaskUpdateAdditions *pTask = new SessionTaskUpdateAdditions(pSession /* GuestSession */, - Utf8Str(aSource), fFlags); + Utf8Str(aSource), aArgs, fFlags); rc = pSession->startTaskAsync(tr("Updating Guest Additions"), pTask, pProgress); if (RT_SUCCESS(rc)) Index: /trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (revision 46523) +++ /trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (revision 46524) @@ -840,8 +840,11 @@ SessionTaskUpdateAdditions::SessionTaskUpdateAdditions(GuestSession *pSession, - const Utf8Str &strSource, uint32_t uFlags) + const Utf8Str &strSource, + const ProcessArguments &aArguments, + uint32_t uFlags) : GuestSessionTask(pSession) { mSource = strSource; + mArguments = aArguments; mFlags = uFlags; } @@ -850,4 +853,43 @@ { +} + +int SessionTaskUpdateAdditions::addProcessArguments(ProcessArguments &aArgumentsDest, + const ProcessArguments &aArgumentsSource) +{ + int rc = VINF_SUCCESS; + + try + { + /* Filter out arguments which already are in the destination to + * not end up having them specified twice. Not the fastest method on the + * planet but does the job. */ + ProcessArguments::const_iterator itSource = aArgumentsSource.begin(); + while (itSource != aArgumentsSource.end()) + { + bool fFound = false; + ProcessArguments::iterator itDest = aArgumentsDest.begin(); + while (itDest != aArgumentsDest.end()) + { + if ((*itDest).equalsIgnoreCase((*itSource))) + { + fFound = true; + break; + } + itDest++; + } + + if (!fFound) + aArgumentsDest.push_back((*itSource)); + + itSource++; + } + } + catch(std::bad_alloc &) + { + return VERR_NO_MEMORY; + } + + return rc; } @@ -1331,4 +1373,8 @@ * Windows taskbar. */ siInstaller.mArguments.push_back(Utf8Str("/post_installstatus")); + /* Add optional installer command line arguments from the API to the + * installer's startup info. */ + rc = addProcessArguments(siInstaller.mArguments, mArguments); + AssertRC(rc); /* If the caller does not want to wait for out guest update process to end, * complete the progress object now so that the caller can do other work. */