Changeset 22746 in vbox

Timestamp:

Sep 3, 2009 1:15:11 PM (15 years ago)

Author:

vboxsync

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

51891

Message:

ConsoleImpl2.cpp: SysprepArgs and SysprepExec should be set before we pull over properties from the server I think. Otherwise they will overwrite any values found in the saved state.

File:

• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (3 diffs)

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -2820 +2820 @@
     else
     {
-        /* Pull over the properties from the server. */
+        /*
+         * Initialize built-in properties that can be changed and saved.
+         *
+         * These are typically transient properties that the guest cannot
+         * change.
+         */
+
+        /* Sysprep execution by VBoxService. */
+        configSetProperty(pConsole->mVMMDev,
+                          "/VirtualBox/HostGuest/SysprepExec", "",
+                          "TRANSIENT, RDONLYGUEST");
+        configSetProperty(pConsole->mVMMDev,
+                          "/VirtualBox/HostGuest/SysprepArgs", "",
+                          "TRANSIENT, RDONLYGUEST");
+
+        /*
+         * Pull over the properties from the server.
+         */
         SafeArray<BSTR> namesOut;
         SafeArray<BSTR> valuesOut;
@@ -2889 +2906 @@
         AssertRCReturn(rc, rc);
 
+        /*
+         * Set properties which cannot be saved.
+         */
         /* Set the VBox version string as a guest property */
         configSetProperty(pConsole->mVMMDev, "/VirtualBox/HostInfo/VBoxVer",
@@ -2895 +2915 @@
         configSetProperty(pConsole->mVMMDev, "/VirtualBox/HostInfo/VBoxRev",
                           RTBldCfgRevisionStr(), "TRANSIENT, RDONLYGUEST");
-        /* Initialize the remote execution properties for ready-on access by
-         * the guest */
-        configSetProperty(pConsole->mVMMDev,
-                          "/VirtualBox/HostGuest/SysprepArgs", "",
-                          "TRANSIENT, RDONLYGUEST");
-
-        /* Register the host notification callback */
+
+        /*
+         * Register the host notification callback
+         */
         HGCMSVCEXTHANDLE hDummy;
-        HGCMHostRegisterServiceExtension (&hDummy, "VBoxGuestPropSvc",
-                                          Console::doGuestPropNotification,
-                                          pvConsole);
+        HGCMHostRegisterServiceExtension(&hDummy, "VBoxGuestPropSvc",
+                                         Console::doGuestPropNotification,
+                                         pvConsole);
 
         Log(("Set VBoxGuestPropSvc property store\n"));