Changeset 23608 in vbox for trunk/src/VBox

Timestamp:

Oct 7, 2009 8:41:52 PM (15 years ago)

Author:

vboxsync

Message:

VBoxService: Backed out r53279; just wait for SysprepRC in *any* case and then read SysprepRet eventually (if succeeded).

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServiceExec.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceExec.cpp

@@ -389 +389 @@
                                 VBoxServiceVerbose(3, "Exec: sysprep argv[%u]: \"%s\"\n", i, papszArgs[i]);
 
-                            /*
-                             * Status reporting via SysprepVBoxRC is required here in order to make a host program wait for it
-                             * in any case (here, yet before the execution or down below if something failed). If no SysprepVBoxRC
-                             * would be updated here the host wouldn't know if he now has to wait for SysprepRet (all succeded) or
-                             * SysprepRC (something failed):
-                             *
-                             * 1. Host sets SysprepArgs
-                             * 2. Host waits for a changing SysprepRC (this could be either here or in step 5)
-                             * 3. If SysprepRC is successful go to 4, otherwise exit
-                             * 4. Host waits for a changing SysprepRet (result of sysprep.exe execution)
-                             * 5. Host waits for a changing SysprepRC (final result of operation)
-                             */
-                            rc = VBoxServiceWritePropF(g_uExecGuestPropSvcClientID, "/VirtualBox/HostGuest/SysprepVBoxRC", "%d", rc);
-                            if (RT_FAILURE(rc))
-                                VBoxServiceError("Exec: Failed to write SysprepVBoxRC while setting up: rc=%Rrc\n", rc);
-
                             RTPROCESS pid;
-                            if (RT_SUCCESS(rc))
-                                rc = RTProcCreate(pszSysprepExec, papszArgs, RTENV_DEFAULT, 0 /*fFlags*/, &pid);
+                            rc = RTProcCreate(pszSysprepExec, papszArgs, RTENV_DEFAULT, 0 /*fFlags*/, &pid);
                             if (RT_SUCCESS(rc))
                             {
@@ -472 +455 @@
                 rc = VBoxServiceWritePropF(g_uExecGuestPropSvcClientID, "/VirtualBox/HostGuest/SysprepVBoxRC", "%d", rc);
                 if (RT_FAILURE(rc))
-                    VBoxServiceError("Exec: Failed to write final SysprepVBoxRC: rc=%Rrc\n", rc);
+                    VBoxServiceError("Exec: Failed to write SysprepVBoxRC: rc=%Rrc\n", rc);
             }
         }