Merge pull request #7647 from thaJeztah/no_execabs

switch back from golang.org/x/sys/execabs to os/exec (go1.19)

pkg/process/io.go

@@ -25,6 +25,7 @@ import (
 	"io"
 	"net/url"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"sync"
 	"sync/atomic"
@@ -36,7 +37,6 @@ import (
 	"github.com/containerd/fifo"
 	runc "github.com/containerd/go-runc"
 	"github.com/containerd/log"
-	exec "golang.org/x/sys/execabs"
 )
 
 const binaryIOProcTermTimeout = 12 * time.Second // Give logger process solid 10 seconds for cleanup

pkg/process/io_util.go

@@ -19,8 +19,7 @@ package process
 import (
 	"net/url"
 	"os"
-
-	exec "golang.org/x/sys/execabs"
+	"os/exec"
 )
 
 // NewBinaryCmd returns a Cmd to be used to start a logging binary.