Changeset 81453 in vbox

Timestamp:

Oct 22, 2019 3:43:09 PM (5 years ago)

Author:

vboxsync

Message:

Main: Use correct names of files in 'guestcontrol updateadditions' command, bugref:8078

File:

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

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

@@ -2358 +2358 @@
                                 static struct { const char *pszDst, *pszIso; } const s_aCertFiles[] =
                                 {
-                                    { "vbox.cer",           "CERT/VBOX.CER" },
-                                    { "vbox-sha1.cer",      "CERT/VBOX_SHA1.CER" },
-                                    { "vbox-sha256.cer",    "CERT/VBOX_SHA256.CER" },
-                                    { "vbox-sha256-r3.cer", "CERT/VBOX_SHA256_R3.CER" },
-                                    { "oracle-vbox.cer",    "CERT/ORACLE_VBOX.CER" },
+                                    { "vbox.cer",           "/CERT/VBOX.CER" },
+                                    { "vbox-sha1.cer",      "/CERT/VBOX-SHA1.CER" },
+                                    { "vbox-sha256.cer",    "/CERT/VBOX-SHA256.CER" },
+                                    { "vbox-sha256-r3.cer", "/CERT/VBOX-SHA256-R3.CER" },
+                                    { "oracle-vbox.cer",    "/CERT/ORACLE-VBOX.CER" },
                                 };
                                 uint32_t fCopyCertUtil = ISOFILE_FLAG_COPY_FROM_ISO;
@@ -2385 +2385 @@
                                     GuestProcessStartupInfo siCertUtilRem;
                                     siCertUtilRem.mName = "VirtualBox Certificate Utility, removing old VirtualBox certificates";
+                                    /* The argv[0] should contain full path to the executable module */
+                                    siCertUtilRem.mArguments.push_back(strUpdateDir + "VBoxCertUtil.exe");
                                     siCertUtilRem.mArguments.push_back(Utf8Str("remove-trusted-publisher"));
                                     siCertUtilRem.mArguments.push_back(Utf8Str("--root")); /* Add root certificate as well. */
@@ -2398 +2400 @@
                                     GuestProcessStartupInfo siCertUtilAdd;
                                     siCertUtilAdd.mName = "VirtualBox Certificate Utility, installing VirtualBox certificates";
+                                    /* The argv[0] should contain full path to the executable module */
+                                    siCertUtilAdd.mArguments.push_back(strUpdateDir + "VBoxCertUtil.exe");
                                     siCertUtilAdd.mArguments.push_back(Utf8Str("add-trusted-publisher"));
                                     siCertUtilAdd.mArguments.push_back(Utf8Str("--root")); /* Add root certificate as well. */
@@ -2410 +2414 @@
                             /* The installers in different flavors, as we don't know (and can't assume)
                              * the guest's bitness. */
-                            mFiles.push_back(ISOFile("VBOXWINDOWSADDITIONS_X86.EXE",
+                            mFiles.push_back(ISOFile("VBOXWINDOWSADDITIONS-X86.EXE",
                                                      strUpdateDir + "VBoxWindowsAdditions-x86.exe",
                                                      ISOFILE_FLAG_COPY_FROM_ISO));
-                            mFiles.push_back(ISOFile("VBOXWINDOWSADDITIONS_AMD64.EXE",
+                            mFiles.push_back(ISOFile("VBOXWINDOWSADDITIONS-AMD64.EXE",
                                                      strUpdateDir + "VBoxWindowsAdditions-amd64.exe",
                                                      ISOFILE_FLAG_COPY_FROM_ISO));
@@ -2422 +2426 @@
                              * setup can take quite a while, so be on the safe side. */
                             siInstaller.mTimeoutMS = 5 * 60 * 1000;
+
+                            /* The argv[0] should contain full path to the executable module */
+                            siInstaller.mArguments.push_back(strUpdateDir + "VBoxWindowsAdditions.exe");
                             siInstaller.mArguments.push_back(Utf8Str("/S")); /* We want to install in silent mode. */
                             siInstaller.mArguments.push_back(Utf8Str("/l")); /* ... and logging enabled. */