diff --git a/cmd/tailscale/depaware-minlinux.txt b/cmd/tailscale/depaware-minlinux.txt index 74824b6d1..4fd27ed21 100644 --- a/cmd/tailscale/depaware-minlinux.txt +++ b/cmd/tailscale/depaware-minlinux.txt @@ -22,7 +22,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep L 💣 github.com/mdlayher/netlink from github.com/jsimonetti/rtnetlink+ L 💣 github.com/mdlayher/netlink/nlenc from github.com/jsimonetti/rtnetlink+ L 💣 github.com/mdlayher/socket from github.com/mdlayher/netlink - 💣 github.com/mitchellh/go-ps from tailscale.com/cmd/tailscale/cli+ + 💣 github.com/mitchellh/go-ps from tailscale.com/cmd/tailscale/cli github.com/peterbourgon/ff/v3 from github.com/peterbourgon/ff/v3/ffcli+ github.com/peterbourgon/ff/v3/ffcli from tailscale.com/cmd/tailscale/cli+ github.com/peterbourgon/ff/v3/internal from github.com/peterbourgon/ff/v3 diff --git a/cmd/tailscaled/depaware-minlinux.txt b/cmd/tailscaled/depaware-minlinux.txt index 27fd99b9d..79eeadab0 100644 --- a/cmd/tailscaled/depaware-minlinux.txt +++ b/cmd/tailscaled/depaware-minlinux.txt @@ -23,7 +23,6 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de L 💣 github.com/mdlayher/netlink from github.com/jsimonetti/rtnetlink+ L 💣 github.com/mdlayher/netlink/nlenc from github.com/jsimonetti/rtnetlink+ L 💣 github.com/mdlayher/socket from github.com/mdlayher/netlink+ - 💣 github.com/mitchellh/go-ps from tailscale.com/safesocket github.com/tailscale/hujson from tailscale.com/ipn/conffile L 💣 github.com/tailscale/netlink from tailscale.com/util/linuxfw+ L 💣 github.com/tailscale/netlink/nl from github.com/tailscale/netlink @@ -246,7 +245,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de html from tailscale.com/ipn/ipnstate+ io from bufio+ io/fs from crypto/x509+ - L io/ioutil from github.com/mitchellh/go-ps+ + L io/ioutil from github.com/tailscale/netlink iter from github.com/go-json-experiment/json/jsontext+ log from expvar+ log/internal from log diff --git a/safesocket/safesocket_ps.go b/safesocket/safesocket_ps.go index 18197846d..561e7ef44 100644 --- a/safesocket/safesocket_ps.go +++ b/safesocket/safesocket_ps.go @@ -5,30 +5,5 @@ package safesocket -import ( - "strings" - - ps "github.com/mitchellh/go-ps" -) - func init() { - tailscaledProcExists = func() bool { - procs, err := ps.Processes() - if err != nil { - return false - } - for _, proc := range procs { - name := proc.Executable() - const tailscaled = "tailscaled" - if len(name) < len(tailscaled) { - continue - } - // Do case insensitive comparison for Windows, - // notably, and ignore any ".exe" suffix. - if strings.EqualFold(name[:len(tailscaled)], tailscaled) { - return true - } - } - return false - } }