Changeset 98729 in vbox for trunk/src

Timestamp:

Feb 24, 2023 7:04:45 PM (2 years ago)

Author:

vboxsync

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

156030

Message:

Main: Linux Additions upgrade: Fix path to rcvboxadd and user notifications, bugref:10359.

Location:

trunk/src/VBox/Main

Files:

• include/GuestSessionImplTasks.h (modified) (1 diff)
• src-client/GuestSessionImplTasks.cpp (modified) (7 diffs)

trunk/src/VBox/Main/include/GuestSessionImplTasks.h

@@ -419 +419 @@
     int addProcessArguments(ProcessArguments &aArgumentsDest, const ProcessArguments &aArgumentsSource);
     int copyFileToGuest(GuestSession *pSession, RTVFS hVfsIso, Utf8Str const &strFileSource, const Utf8Str &strFileDest, bool fOptional);
-    int runFileOnGuest(GuestSession *pSession, GuestProcessStartupInfo &procInfo);
+    int runFileOnGuest(GuestSession *pSession, GuestProcessStartupInfo &procInfo, bool fSilent = false);
 
     int checkGuestAdditionsStatus(GuestSession *pSession, eOSType osType);

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

@@ -2623 +2623 @@
  * @param   pSession            Guest session to use.
  * @param   procInfo            Guest process startup info to use.
+ * @param   fSilent             Whether to set progress into failure state in case of error.
  */
-int GuestSessionTaskUpdateAdditions::runFileOnGuest(GuestSession *pSession, GuestProcessStartupInfo &procInfo)
+int GuestSessionTaskUpdateAdditions::runFileOnGuest(GuestSession *pSession, GuestProcessStartupInfo &procInfo, bool fSilent)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -2641 +2642 @@
     }
 
-    if (RT_FAILURE(vrc))
+    if (   RT_FAILURE(vrc)
+        && !fSilent)
     {
         switch (vrc)
@@ -2688 +2690 @@
     if (osType == eOSType_Linux)
     {
-        const Utf8Str ksStatusScript = Utf8Str("/usr/sbin/rcvboxadd");
+        const Utf8Str ksStatusScript = Utf8Str("/sbin/rcvboxadd");
 
         /* Check if Guest Additions kernel modules were loaded. */
@@ -2698 +2700 @@
         procInfo.mArguments.push_back("status-kernel");
 
-        vrc = runFileOnGuest(pSession, procInfo);
+        vrc = runFileOnGuest(pSession, procInfo, true /* fSilent */);
         if (RT_SUCCESS(vrc))
         {
@@ -2706 +2708 @@
             procInfo.mArguments.push_back("status-user");
 
-            vrc = runFileOnGuest(pSession, procInfo);
+            vrc = runFileOnGuest(pSession, procInfo, true /* fSilent */);
             if (RT_FAILURE(vrc))
                 hrc = setProgressErrorMsg(VBOX_E_GSTCTL_GUEST_ERROR,
@@ -3290 +3292 @@
                                 hrc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
                                                           Utf8StrFmt(tr("Automatic update of Guest Additions has failed: "
-                                                                        "guest services were not restarted, please reinstall Guest Additions")));
+                                                                        "guest services were not restarted, please reinstall Guest Additions manually")));
                         }
                         else
@@ -3297 +3299 @@
                             hrc = setProgressErrorMsg(VBOX_E_IPRT_ERROR,
                                                       Utf8StrFmt(tr("Old guest session is still active, guest services were not restarted "
-                                                                    "after installation, please reinstall Guest Additions")));
+                                                                    "after installation, please reinstall Guest Additions manually")));
                         }
                     }