sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-06 13:39:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Keep the deferred UI close as a fallback for the immediate taskkill

Browse Source 
The immediate taskkill runs with the token of whoever launched msiexec. A
non-SYSTEM install cannot terminate a UI running in another user's session,
so keep the deferred CloseApplication, which runs as LocalSystem, to stop it
before InstallFiles. When taskkill already succeeded it finds no process.
This commit is contained in:
Zoltán Papp
2026-10-05 14:56:42 +02:00
parent 67834d1b92
commit d52241b488
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/netbird.wxs
+1
View File
@@ -74,6 +74,7 @@
</ComponentGroup> </ComponentGroup>
<util:CloseApplication Id="CloseNetBird" CloseMessage="no" Target="netbird.exe" RebootPrompt="no" /> <util:CloseApplication Id="CloseNetBird" CloseMessage="no" Target="netbird.exe" RebootPrompt="no" />
<util:CloseApplication Id="CloseNetBirdUI" CloseMessage="no" Target="netbird-ui.exe" RebootPrompt="no" TerminateProcess="0" />
<SetProperty Id="WixQuietExecCmdLine" Value="&quot;[System64Folder]taskkill.exe&quot; /F /IM netbird-ui.exe" Before="KillNetBirdUI" Sequence="execute" /> <SetProperty Id="WixQuietExecCmdLine" Value="&quot;[System64Folder]taskkill.exe&quot; /F /IM netbird-ui.exe" Before="KillNetBirdUI" Sequence="execute" />
<CustomAction Id="KillNetBirdUI" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" DllEntry="WixQuietExec" Execute="immediate" Return="ignore" /> <CustomAction Id="KillNetBirdUI" BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" DllEntry="WixQuietExec" Execute="immediate" Return="ignore" />