diff --git a/cmd/tailscaled/tailscaled_windows.go b/cmd/tailscaled/tailscaled_windows.go index d916cc629..35c878f38 100644 --- a/cmd/tailscaled/tailscaled_windows.go +++ b/cmd/tailscaled/tailscaled_windows.go @@ -435,6 +435,9 @@ func babysitProc(ctx context.Context, args []string, logf logger.Logf) { startTime := time.Now() log.Printf("exec: %#v %v", executable, args) cmd := exec.Command(executable, args...) + cmd.SysProcAttr = &syscall.SysProcAttr{ + CreationFlags: windows.DETACHED_PROCESS, + } // Create a pipe object to use as the subproc's stdin. // When the writer goes away, the reader gets EOF. diff --git a/net/dns/flush_windows.go b/net/dns/flush_windows.go index cefc06ffc..d7c7b7fce 100644 --- a/net/dns/flush_windows.go +++ b/net/dns/flush_windows.go @@ -6,10 +6,17 @@ package dns import ( "fmt" "os/exec" + "syscall" + + "golang.org/x/sys/windows" ) func flushCaches() error { - out, err := exec.Command("ipconfig", "/flushdns").CombinedOutput() + cmd := exec.Command("ipconfig", "/flushdns") + cmd.SysProcAttr = &syscall.SysProcAttr{ + CreationFlags: windows.DETACHED_PROCESS, + } + out, err := cmd.CombinedOutput() if err != nil { return fmt.Errorf("%v (output: %s)", err, out) } diff --git a/net/dns/manager_windows.go b/net/dns/manager_windows.go index ad358dc26..56bdbbe06 100644 --- a/net/dns/manager_windows.go +++ b/net/dns/manager_windows.go @@ -373,7 +373,9 @@ func (m *windowsManager) SetDNS(cfg OSConfig) error { t0 := time.Now() m.logf("running ipconfig /registerdns ...") cmd := exec.Command("ipconfig", "/registerdns") - cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true} + cmd.SysProcAttr = &syscall.SysProcAttr{ + CreationFlags: windows.DETACHED_PROCESS, + } err := cmd.Run() d := time.Since(t0).Round(time.Millisecond) if err != nil { @@ -385,7 +387,9 @@ func (m *windowsManager) SetDNS(cfg OSConfig) error { t0 = time.Now() m.logf("running ipconfig /flushdns ...") cmd = exec.Command("ipconfig", "/flushdns") - cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true} + cmd.SysProcAttr = &syscall.SysProcAttr{ + CreationFlags: windows.DETACHED_PROCESS, + } err = cmd.Run() d = time.Since(t0).Round(time.Millisecond) if err != nil { diff --git a/net/dns/wsl_windows.go b/net/dns/wsl_windows.go index e4b25cca8..b769405fb 100644 --- a/net/dns/wsl_windows.go +++ b/net/dns/wsl_windows.go @@ -228,8 +228,8 @@ func wslRun(cmd *exec.Cmd) (err error) { } cmd.SysProcAttr = &syscall.SysProcAttr{ - Token: syscall.Token(token), - HideWindow: true, + CreationFlags: windows.CREATE_NO_WINDOW, + Token: syscall.Token(token), } return cmd.Run() } diff --git a/wgengine/router/router_windows.go b/wgengine/router/router_windows.go index 711de03da..64163660d 100644 --- a/wgengine/router/router_windows.go +++ b/wgengine/router/router_windows.go @@ -233,7 +233,9 @@ func (ft *firewallTweaker) runFirewall(args ...string) (time.Duration, error) { t0 := time.Now() args = append([]string{"advfirewall", "firewall"}, args...) cmd := exec.Command(ft.getNetshPath(), args...) - cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true} + cmd.SysProcAttr = &syscall.SysProcAttr{ + CreationFlags: windows.DETACHED_PROCESS, + } b, err := cmd.CombinedOutput() if err != nil { err = fmt.Errorf("%w: %v", err, string(b)) @@ -356,6 +358,9 @@ func (ft *firewallTweaker) doSet(local []string, killswitch bool, clear bool, pr return err } proc := exec.Command(exe, "/firewall", ft.tunGUID.String()) + proc.SysProcAttr = &syscall.SysProcAttr{ + CreationFlags: windows.DETACHED_PROCESS, + } in, err := proc.StdinPipe() if err != nil { return err