Changeset 80231 in vbox for trunk/src/VBox/Installer/win/Stub

Timestamp:

Aug 12, 2019 6:49:55 PM (5 years ago)

Author:

vboxsync

Message:

Installer/win/VBoxStub: Return 3010 if a reboot is required. Added --ignore-reboot to trigger old behaviour that supresses the status code and exits with 0.

File:

• trunk/src/VBox/Installer/win/Stub/VBoxStub.cpp (modified) (7 diffs)

trunk/src/VBox/Installer/win/Stub/VBoxStub.cpp

@@ -584 +584 @@
         return RTEXITCODE_SUCCESS;
     if (uStatus == ERROR_SUCCESS_REBOOT_REQUIRED)
-        return RTEXITCODE_SUCCESS; /* we currently don't indicate this */
+    {
+        if (g_fSilent)
+            RTMsgInfo("Reboot required (by %s)\n", pszMsi);
+        return (RTEXITCODE)uStatus;
+    }
 
     /*
@@ -876 +880 @@
     bool fEnableSilentCert         = true;
 #endif
+    bool fIgnoreReboot             = false;
     char szExtractPath[RTPATH_MAX] = {0};
     char szMSIArgs[_4K]            = {0};
@@ -906 +911 @@
         { "-reinstall",         'f', RTGETOPT_REQ_NOTHING },
         { "/reinstall",         'f', RTGETOPT_REQ_NOTHING },
+        { "--ignore-reboot",    'r', RTGETOPT_REQ_NOTHING },
         { "--verbose",          'v', RTGETOPT_REQ_NOTHING },
         { "-verbose",           'v', RTGETOPT_REQ_NOTHING },
@@ -975 +981 @@
                 break;
 
+            case 'r':
+                fIgnoreReboot = true;
+                break;
+
             case 'V':
                 ShowInfo("Version: %d.%d.%d.%d",
@@ -997 +1007 @@
                          "--path                   - Sets the path of the extraction directory\n"
                          "--reinstall              - Forces VirtualBox to get re-installed\n"
+                         "--ignore-reboot          - Don't set exit code to 3010 if a reboot is required\n"
                          "--silent                 - Enables silent mode installation\n"
-                         "--version                - Print version number and exit\n\n"
+                         "--version                - Print version number and exit\n"
+                         "\n"
                          "Examples:\n"
                          "%s --msiparams INSTALLDIR=C:\\VBox\n"
@@ -1152 +1164 @@
                     unsigned iPackage = 0;
                     while (   iPackage < pHeader->byCntPkgs
-                           && rcExit == RTEXITCODE_SUCCESS)
+                           && (rcExit == RTEXITCODE_SUCCESS || rcExit == (RTEXITCODE)ERROR_SUCCESS_REBOOT_REQUIRED))
                     {
-                        rcExit = ProcessPackage(iPackage, szExtractPath,
-                                                szMSIArgs, fEnableLogging);
+                        RTEXITCODE rcExit2 = ProcessPackage(iPackage, szExtractPath, szMSIArgs, fEnableLogging);
+                        if (rcExit2 != RTEXITCODE_SUCCESS)
+                            rcExit = rcExit2;
                         iPackage++;
                     }
@@ -1193 +1206 @@
     }
 
-    return rcExit;
-}
-
+    return rcExit != (RTEXITCODE)ERROR_SUCCESS_REBOOT_REQUIRED || !fIgnoreReboot ? rcExit : RTEXITCODE_SUCCESS;
+}
+