Merge pull request #1280 from dorssel/fix_installer_timing

Add installer delay for detach/unbind to complete

Author: dorssel

Installer/Server.wxs

@@ -111,6 +111,11 @@ SPDX-License-Identifier: GPL-3.0-only
         <SetProperty Id="DetachAll" Value="&quot;[#usbipd.exe]&quot; detach --all" Sequence="execute" Before="DetachAll" Condition="$(var.UpdateOrRepair)" />
         <CustomAction Id="DetachAll" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" DllEntry="WixQuietExec" Return="ignore" Impersonate="no" Execute="deferred" />
 
+        <!-- Delay so detach can finish its side effects. -->
+        <!-- NOTE: This will run the *old* (to be upgraded or repaired) version. -->
+        <SetProperty Id="DelayAfterDetach" Value="&quot;[#usbipd.exe]&quot; installer delay" Sequence="execute" Before="DelayAfterDetach" Condition="$(var.UpdateOrRepair)" />
+        <CustomAction Id="DelayAfterDetach" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" DllEntry="WixQuietExec" Return="ignore" Impersonate="no" Execute="deferred" />
+
         <!-- Disable all force-bound devices, such that (after DetachAll) the VBoxUSB driver is not used at all (best effort). -->
         <!-- NOTE: This will run the *old* (to be upgraded or repaired) version (< 5.3.0 does not even have this). -->
         <SetProperty Id="DisableForced" Value="&quot;[#usbipd.exe]&quot; installer disable_forced" Sequence="execute" Before="DisableForced" Condition="$(var.UpdateOrRepair)" />
@@ -120,6 +125,10 @@ SPDX-License-Identifier: GPL-3.0-only
         <SetProperty Id="UnbindAll" Value="&quot;[#usbipd.exe]&quot; unbind --all" Sequence="execute" Before="UnbindAll" Condition="$(var.UninstallOnly)" />
         <CustomAction Id="UnbindAll" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" DllEntry="WixQuietExec" Return="ignore" Impersonate="no" Execute="deferred" />
 
+        <!-- Delay so unbind can finish its side effects. -->
+        <SetProperty Id="DelayAfterUnbind" Value="&quot;[#usbipd.exe]&quot; installer delay" Sequence="execute" Before="DelayAfterUnbind" Condition="$(var.UninstallOnly)" />
+        <CustomAction Id="DelayAfterUnbind" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" DllEntry="WixQuietExec" Return="ignore" Impersonate="no" Execute="deferred" />
+
         <!-- This will uninstall all stub devices, so they don't "use" the VBoxUSB driver (remember: they are already inactive at this point) (cleanup) (best effort). -->
         <SetProperty Id="UninstallStubs1" Value="&quot;[#usbipd.exe]&quot; installer uninstall_stubs" Sequence="execute" Before="UninstallStubs1" Condition="$(var.UninstallOnly)" />
         <CustomAction Id="UninstallStubs1" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" DllEntry="WixQuietExec" Return="ignore" Impersonate="no" Execute="deferred" />
@@ -166,8 +175,10 @@ SPDX-License-Identifier: GPL-3.0-only
 
         <InstallExecuteSequence>
             <Custom Action="DetachAll" Before="StopServices" Condition="$(var.UpdateOrRepair)" />
+            <Custom Action="DelayAfterDetach" Before="StopServices" Condition="$(var.UpdateOrRepair)" />
             <Custom Action="DisableForced" Before="StopServices" Condition="$(var.UpdateOrRepair)" />
             <Custom Action="UnbindAll" Before="StopServices" Condition="$(var.UninstallOnly)" />
+            <Custom Action="DelayAfterUnbind" Before="StopServices" Condition="$(var.UninstallOnly)" />
             <Custom Action="UninstallStubs1" Before="StopServices" Condition="$(var.UninstallOnly)" />
             <Custom Action="UninstallOldDrivers1" Before="StopServices" Condition="$(var.UninstallOnly)" />
             <Custom Action="UninstallDriver" Before="StopServices" Condition="$(var.UninstallOnly)" />

Usbipd/CommandHandlersInstaller.cs

@@ -14,6 +14,15 @@ namespace Usbipd;
 
 sealed partial class CommandHandlers : ICommandHandlers
 {
+    async Task<ExitCode> ICommandHandlers.InstallerDelay(IConsole console, CancellationToken cancellationToken)
+    {
+        ConsoleTools.ReportInfo(console, $"delay");
+
+        await Task.Delay(TimeSpan.FromSeconds(2), cancellationToken);
+
+        return ExitCode.Success;
+    }
+
     Task<ExitCode> ICommandHandlers.InstallerInstallDriver(IConsole console, CancellationToken cancellationToken)
     {
         ConsoleTools.ReportInfo(console, "install_driver");

Usbipd/ICommandHandlers.cs

@@ -35,6 +35,7 @@ Task<ExitCode> AttachWsl(VidPid vidPid, bool autoAttach, string? distribution, I
     Task<ExitCode> Server(string[] args, IConsole console, CancellationToken cancellationToken);
 
     // Installer
+    Task<ExitCode> InstallerDelay(IConsole console, CancellationToken cancellationToken);
     Task<ExitCode> InstallerInstallDriver(IConsole console, CancellationToken cancellationToken);
     Task<ExitCode> InstallerUpdateDrivers(IConsole console, CancellationToken cancellationToken);
     Task<ExitCode> InstallerInstallMonitor(IConsole console, CancellationToken cancellationToken);

Usbipd/Program.cs

@@ -748,6 +748,7 @@ await action(console, cancellationToken)
                 installCommand.Subcommands.Add(subcommand);
             }
 
+            AddInstallerSubcommand("delay", commandHandlers.InstallerDelay);
             AddInstallerSubcommand("install_driver", commandHandlers.InstallerInstallDriver);
             AddInstallerSubcommand("uninstall_driver", commandHandlers.InstallerUninstallDriver);
             AddInstallerSubcommand("update_drivers", commandHandlers.InstallerUpdateDrivers);