From 51bc9a6d9d1d0e22c580152dde16da47a5ab6ecc Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Tue, 11 Jan 2022 15:26:58 -0800 Subject: [PATCH] net/netns: remove a useless probe of the "ip" command We stopped using it in 1.18. Change-Id: If5adf1d99275286a89e2a05f0bce5193d9f6e5e3 Signed-off-by: Brad Fitzpatrick --- net/netns/netns_linux.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/netns/netns_linux.go b/net/netns/netns_linux.go index d2d5872ec..4434c5ddd 100644 --- a/net/netns/netns_linux.go +++ b/net/netns/netns_linux.go @@ -11,7 +11,6 @@ import ( "fmt" "net" "os" - "os/exec" "sync" "syscall" @@ -67,8 +66,7 @@ func socketMarkWorks() bool { // If it doesn't, we have to use SO_BINDTODEVICE on our sockets instead. func useSocketMark() bool { socketMarkWorksOnce.Do(func() { - ipRuleWorks := exec.Command("ip", "rule").Run() == nil - socketMarkWorksOnce.v = ipRuleWorks && socketMarkWorks() + socketMarkWorksOnce.v = socketMarkWorks() }) return socketMarkWorksOnce.v }