Changeset 107392 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Dec 20, 2024 8:55:27 AM (3 months ago)

Author:

vboxsync

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

166435

Message:

Windows driver installation/VBoxDrvInst: Added a "--ignore-reboot" option to the install/uninstall sub commands. This will ignore the reboot requirements and also will affect the exit code (0 instead of 5, as documented).

File:

• trunk/src/VBox/GuestHost/installation/VBoxDrvInst.cpp (modified) (12 diffs)

trunk/src/VBox/GuestHost/installation/VBoxDrvInst.cpp

@@ -140 +140 @@
     VBOXDRVINST_INSTALL_OPT_PNPID,
     VBOXDRVINST_INSTALL_OPT_NOT_FORCE,
-    VBOXDRVINST_INSTALL_OPT_NOT_SILENT
+    VBOXDRVINST_INSTALL_OPT_NOT_SILENT,
+    VBOXDRVINST_INSTALL_OPT_IGNORE_REBOOT
 };
 
@@ -148 +149 @@
 static const RTGETOPTDEF g_aCmdInstallOptions[] =
 {
-    { "--inf-file",    VBOXDRVINST_INSTALL_OPT_INF_FILE,    RTGETOPT_REQ_STRING   },
-    { "--inf-section", VBOXDRVINST_INSTALL_OPT_INF_SECTION, RTGETOPT_REQ_STRING   },
-    { "--model",       VBOXDRVINST_INSTALL_OPT_MODEL,       RTGETOPT_REQ_STRING   },
-    { "--pnp",         VBOXDRVINST_INSTALL_OPT_PNPID,       RTGETOPT_REQ_STRING   },
-    { "--pnpid" ,      VBOXDRVINST_INSTALL_OPT_PNPID,       RTGETOPT_REQ_STRING   },
-    { "--pnp-id",      VBOXDRVINST_INSTALL_OPT_PNPID,       RTGETOPT_REQ_STRING   },
-    { "--not-force",   VBOXDRVINST_INSTALL_OPT_NOT_FORCE,   RTGETOPT_REQ_NOTHING  },
-    { "--not-silent",  VBOXDRVINST_INSTALL_OPT_NOT_SILENT,  RTGETOPT_REQ_NOTHING  }
+    { "--inf-file",      VBOXDRVINST_INSTALL_OPT_INF_FILE,       RTGETOPT_REQ_STRING  },
+    { "--inf-section",   VBOXDRVINST_INSTALL_OPT_INF_SECTION,    RTGETOPT_REQ_STRING  },
+    { "--model",         VBOXDRVINST_INSTALL_OPT_MODEL,          RTGETOPT_REQ_STRING  },
+    { "--pnp",           VBOXDRVINST_INSTALL_OPT_PNPID,          RTGETOPT_REQ_STRING  },
+    { "--pnpid" ,        VBOXDRVINST_INSTALL_OPT_PNPID,          RTGETOPT_REQ_STRING  },
+    { "--pnp-id",        VBOXDRVINST_INSTALL_OPT_PNPID,          RTGETOPT_REQ_STRING  },
+    { "--not-force",     VBOXDRVINST_INSTALL_OPT_NOT_FORCE,      RTGETOPT_REQ_NOTHING },
+    { "--not-silent",    VBOXDRVINST_INSTALL_OPT_NOT_SILENT,     RTGETOPT_REQ_NOTHING },
+    { "--ignore-reboot", VBOXDRVINST_INSTALL_OPT_IGNORE_REBOOT, RTGETOPT_REQ_NOTHING }
 };
 
@@ -179 +181 @@
     VBOXDRVINST_UNINSTALL_OPT_INF_SECTION,
     VBOXDRVINST_UNINSTALL_OPT_MODEL,
-    VBOXDRVINST_UNINSTALL_OPT_PNPID
+    VBOXDRVINST_UNINSTALL_OPT_PNPID,
+    VBOXDRVINST_UNINSTALL_OPT_IGNORE_REBOOT
 };
 
@@ -187 +190 @@
 static const RTGETOPTDEF g_aCmdUninstallOptions[] =
 {
-    { "--inf-file",    VBOXDRVINST_UNINSTALL_OPT_INF_FILE,    RTGETOPT_REQ_STRING  },
-    { "--inf-section", VBOXDRVINST_UNINSTALL_OPT_INF_SECTION, RTGETOPT_REQ_STRING  },
-    { "--model",       VBOXDRVINST_UNINSTALL_OPT_MODEL,       RTGETOPT_REQ_STRING  },
-    { "--pnp",         VBOXDRVINST_UNINSTALL_OPT_PNPID,       RTGETOPT_REQ_STRING  },
-    { "--pnpid" ,      VBOXDRVINST_UNINSTALL_OPT_PNPID,       RTGETOPT_REQ_STRING  },
-    { "--pnp-id",      VBOXDRVINST_UNINSTALL_OPT_PNPID,       RTGETOPT_REQ_STRING  }
+    { "--inf-file",      VBOXDRVINST_UNINSTALL_OPT_INF_FILE,      RTGETOPT_REQ_STRING  },
+    { "--inf-section",   VBOXDRVINST_UNINSTALL_OPT_INF_SECTION,   RTGETOPT_REQ_STRING  },
+    { "--model",         VBOXDRVINST_UNINSTALL_OPT_MODEL,         RTGETOPT_REQ_STRING  },
+    { "--pnp",           VBOXDRVINST_UNINSTALL_OPT_PNPID,         RTGETOPT_REQ_STRING  },
+    { "--pnpid" ,        VBOXDRVINST_UNINSTALL_OPT_PNPID,         RTGETOPT_REQ_STRING  },
+    { "--pnp-id",        VBOXDRVINST_UNINSTALL_OPT_PNPID,         RTGETOPT_REQ_STRING  },
+    { "--ignore-reboot", VBOXDRVINST_UNINSTALL_OPT_IGNORE_REBOOT, RTGETOPT_REQ_NOTHING }
 };
 
@@ -401 +405 @@
     switch (pOpt->iShort)
     {
-        case VBOXDRVINST_INSTALL_OPT_INF_FILE:    return "Specifies the INF file to install";
-        case VBOXDRVINST_INSTALL_OPT_INF_SECTION: return "Specifies the INF section to install";
-        case VBOXDRVINST_INSTALL_OPT_MODEL:       return "Specifies the driver model";
-        case VBOXDRVINST_INSTALL_OPT_PNPID:       return "Specifies the PnP (device) ID";
-        case VBOXDRVINST_INSTALL_OPT_NOT_FORCE:   return "Installation will not be forced";
-        case VBOXDRVINST_INSTALL_OPT_NOT_SILENT:  return "Installation will not run in silent mode";
+        case VBOXDRVINST_INSTALL_OPT_INF_FILE:      return "Specifies the INF file to install";
+        case VBOXDRVINST_INSTALL_OPT_INF_SECTION:   return "Specifies the INF section to install";
+        case VBOXDRVINST_INSTALL_OPT_MODEL:         return "Specifies the driver model";
+        case VBOXDRVINST_INSTALL_OPT_PNPID:         return "Specifies the PnP (device) ID";
+        case VBOXDRVINST_INSTALL_OPT_NOT_FORCE:     return "Installation will not be forced";
+        case VBOXDRVINST_INSTALL_OPT_NOT_SILENT:    return "Installation will not run in silent mode";
+        case VBOXDRVINST_INSTALL_OPT_IGNORE_REBOOT: return "Ignores reboot requirements";
         default:
             break;
@@ -428 +433 @@
     /* By default we want to force an installation and be silent. */
     uint32_t fInstall = VBOX_WIN_DRIVERINSTALL_F_SILENT | VBOX_WIN_DRIVERINSTALL_F_FORCE;
+
+    /* Whether to ignore reboot messages or not. This will also affect the returned exit code. */
+    bool fIgnoreReboot = false;
 
     int rc = VINF_SUCCESS;
@@ -473 +481 @@
                 break;
 
+            case VBOXDRVINST_INSTALL_OPT_IGNORE_REBOOT:
+                fIgnoreReboot = true;
+                break;
+
             default:
                 return RTGetOptPrintError(ch, &ValueUnion);
@@ -492 +504 @@
         if (RT_SUCCESS(rc))
         {
-            if (rc == VINF_REBOOT_NEEDED)
+            if (   rc == VINF_REBOOT_NEEDED
+                && !fIgnoreReboot)
                 rcExit = (RTEXITCODE)VBOXDRVINSTEXITCODE_REBOOT_NEEDED;
         }
@@ -514 +527 @@
     switch (pOpt->iShort)
     {
-        case VBOXDRVINST_UNINSTALL_OPT_INF_FILE:    return "Specifies the INF File to install";
-        case VBOXDRVINST_UNINSTALL_OPT_INF_SECTION: return "Specifies the INF section to install";
-        case VBOXDRVINST_UNINSTALL_OPT_MODEL:       return "Specifies the driver model to install";
-        case VBOXDRVINST_UNINSTALL_OPT_PNPID:       return "Specifies the PnP (device) ID to install";
+        case VBOXDRVINST_UNINSTALL_OPT_INF_FILE:      return "Specifies the INF File to install";
+        case VBOXDRVINST_UNINSTALL_OPT_INF_SECTION:   return "Specifies the INF section to install";
+        case VBOXDRVINST_UNINSTALL_OPT_MODEL:         return "Specifies the driver model to install";
+        case VBOXDRVINST_UNINSTALL_OPT_PNPID:         return "Specifies the PnP (device) ID to install";
+        case VBOXDRVINST_UNINSTALL_OPT_IGNORE_REBOOT: return "Ignores reboot requirements";
         default:
             break;
@@ -539 +553 @@
     /* By default we want a silent uninstallation. */
     uint32_t fInstall = VBOX_WIN_DRIVERINSTALL_F_SILENT;
+
+    /* Whether to ignore reboot messages or not. This will also affect the returned exit code. */
+    bool fIgnoreReboot = false;
 
     int rc = VINF_SUCCESS;
@@ -580 +597 @@
                 break;
 
+            case VBOXDRVINST_UNINSTALL_OPT_IGNORE_REBOOT:
+                fIgnoreReboot = true;
+                break;
+
             default:
                 return RTGetOptPrintError(ch, &ValueUnion);
@@ -599 +620 @@
         if (RT_SUCCESS(rc))
         {
-            if (rc == VINF_REBOOT_NEEDED)
+            if (   rc == VINF_REBOOT_NEEDED
+                && !fIgnoreReboot)
                 rcExit = (RTEXITCODE)VBOXDRVINSTEXITCODE_REBOOT_NEEDED;
         }