remove remaining uses of golang.org/x/sys/execabs

thaJeztah · thaJeztah · commit 872af82f572a · 2024-01-05T10:09:44.000+01:00
Signed-off-by: Sebastiaan van Stijn &lt;github@gone.nl&gt;
diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go
@@ -27,6 +27,7 @@ import (
 	"io"
 	"net"
 	"os"
+	"os/exec"
 	"os/signal"
 	"runtime"
 	"runtime/debug"
@@ -48,7 +49,6 @@ import (
 	"github.com/containerd/containerd/version"
 	"github.com/containerd/ttrpc"
 	"github.com/sirupsen/logrus"
-	exec "golang.org/x/sys/execabs"
 	"golang.org/x/sys/unix"
 )
 
diff --git a/runtime/v1/shim/client/client.go b/runtime/v1/shim/client/client.go
@@ -25,6 +25,7 @@ import (
 	"io"
 	"net"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -40,7 +41,6 @@ import (
 	shimapi "github.com/containerd/containerd/runtime/v1/shim/v1"
 	"github.com/containerd/containerd/sys"
 	"github.com/containerd/ttrpc"
-	exec "golang.org/x/sys/execabs"
 	"golang.org/x/sys/unix"
 )
 
diff --git a/runtime/v1/shim/client/client_linux.go b/runtime/v1/shim/client/client_linux.go
@@ -18,10 +18,10 @@ package client
 
 import (
 	"fmt"
+	"os/exec"
 	"syscall"
 
 	"github.com/containerd/cgroups/v3/cgroup1"
-	exec "golang.org/x/sys/execabs"
 )
 
 func getSysProcAttr() *syscall.SysProcAttr {
diff --git a/runtime/v1/shim/client/client_unix.go b/runtime/v1/shim/client/client_unix.go
@@ -19,9 +19,8 @@
 package client
 
 import (
+	"os/exec"
 	"syscall"
-
-	exec "golang.org/x/sys/execabs"
 )
 
 func getSysProcAttr() *syscall.SysProcAttr {
diff --git a/runtime/v2/runc/v1/service.go b/runtime/v2/runc/v1/service.go
@@ -23,6 +23,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/exec"
 	"path/filepath"
 	goruntime "runtime"
 	"sync"
@@ -51,7 +52,6 @@ import (
 	runcC "github.com/containerd/go-runc"
 	"github.com/containerd/typeurl/v2"
 	"github.com/sirupsen/logrus"
-	exec "golang.org/x/sys/execabs"
 	"golang.org/x/sys/unix"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,10 @@ package client`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`"fmt"`
	`21`	`+ "os/exec"`
`21`	`22`	`"syscall"`
`22`	`23`
`23`	`24`	`"github.com/containerd/cgroups/v3/cgroup1"`
`24`		`- exec "golang.org/x/sys/execabs"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`func getSysProcAttr() *syscall.SysProcAttr {`
Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,8 @@`
`19`	`19`	`package client`
`20`	`20`
`21`	`21`	`import (`
	`22`	`+ "os/exec"`
`22`	`23`	`"syscall"`
`23`		`-`
`24`		`- exec "golang.org/x/sys/execabs"`
`25`	`24`	`)`
`26`	`25`
`27`	`26`	`func getSysProcAttr() *syscall.SysProcAttr {`