Move sys to pkg/sys

Signed-off-by: Derek McGowan <derek@mcg.dev>

cmd/containerd-shim-runc-v2/task/service.go

@@ -39,13 +39,13 @@ import (
 	oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2"
 	"github.com/containerd/containerd/v2/pkg/shutdown"
 	"github.com/containerd/containerd/v2/pkg/stdio"
+	"github.com/containerd/containerd/v2/pkg/sys/reaper"
 	"github.com/containerd/containerd/v2/pkg/userns"
 	"github.com/containerd/containerd/v2/protobuf"
 	ptypes "github.com/containerd/containerd/v2/protobuf/types"
 	"github.com/containerd/containerd/v2/runtime"
 	"github.com/containerd/containerd/v2/runtime/v2/runc/options"
 	"github.com/containerd/containerd/v2/runtime/v2/shim"
-	"github.com/containerd/containerd/v2/sys/reaper"
 	runcC "github.com/containerd/go-runc"
 	"github.com/containerd/log"
 	"github.com/containerd/ttrpc"

cmd/containerd/command/main.go

@@ -33,7 +33,7 @@ import (
 	"github.com/containerd/containerd/v2/defaults"
 	_ "github.com/containerd/containerd/v2/metrics" // import containerd build info
 	"github.com/containerd/containerd/v2/pkg/errdefs"
-	"github.com/containerd/containerd/v2/sys"
+	"github.com/containerd/containerd/v2/pkg/sys"
 	"github.com/containerd/containerd/v2/version"
 	"github.com/containerd/log"
 	"github.com/urfave/cli"

cmd/containerd/server/server.go

@@ -59,12 +59,12 @@ import (
 	"github.com/containerd/containerd/v2/defaults"
 	"github.com/containerd/containerd/v2/pkg/deprecation"
 	"github.com/containerd/containerd/v2/pkg/dialer"
+	"github.com/containerd/containerd/v2/pkg/sys"
 	"github.com/containerd/containerd/v2/pkg/timeout"
 	"github.com/containerd/containerd/v2/platforms"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/plugins/content/local"
 	"github.com/containerd/containerd/v2/plugins/services/warning"
-	"github.com/containerd/containerd/v2/sys"
 	"github.com/containerd/plugin"
 	"github.com/containerd/plugin/dynamic"
 	"github.com/containerd/plugin/registry"

cmd/containerd/server/server_linux.go

@@ -24,7 +24,7 @@ import (
 	cgroup1 "github.com/containerd/cgroups/v3/cgroup1"
 	cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2"
 	srvconfig "github.com/containerd/containerd/v2/cmd/containerd/server/config"
-	"github.com/containerd/containerd/v2/sys"
+	"github.com/containerd/containerd/v2/pkg/sys"
 	"github.com/containerd/log"
 	"github.com/containerd/ttrpc"
 	specs "github.com/opencontainers/runtime-spec/specs-go"

contrib/fuzz/daemon.go

@@ -26,7 +26,7 @@ import (
 	"github.com/containerd/containerd/v2/cmd/containerd/server"
 	"github.com/containerd/containerd/v2/cmd/containerd/server/config"
 	"github.com/containerd/containerd/v2/defaults"
-	"github.com/containerd/containerd/v2/sys"
+	"github.com/containerd/containerd/v2/pkg/sys"
 	"github.com/containerd/log"
 )
 

core/mount/mount_idmapped_linux.go

@@ -27,7 +27,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
-	"github.com/containerd/containerd/v2/sys"
+	"github.com/containerd/containerd/v2/pkg/sys"
 )
 
 // TODO: Support multiple mappings in future

integration/client/container_linux_test.go

@@ -39,9 +39,9 @@ import (
 	"github.com/containerd/containerd/v2/pkg/cio"
 	"github.com/containerd/containerd/v2/pkg/errdefs"
 	"github.com/containerd/containerd/v2/pkg/oci"
+	"github.com/containerd/containerd/v2/pkg/sys"
 	"github.com/containerd/containerd/v2/plugins"
 	"github.com/containerd/containerd/v2/runtime/v2/runc/options"
-	"github.com/containerd/containerd/v2/sys"
 
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/stretchr/testify/require"

runtime/v2/shim/shim_linux.go

@@ -17,7 +17,7 @@
 package shim
 
 import (
-	"github.com/containerd/containerd/v2/sys/reaper"
+	"github.com/containerd/containerd/v2/pkg/sys/reaper"
 	"github.com/containerd/ttrpc"
 )
 

runtime/v2/shim/shim_unix.go

@@ -27,7 +27,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/containerd/containerd/v2/sys/reaper"
+	"github.com/containerd/containerd/v2/pkg/sys/reaper"
 	"github.com/containerd/fifo"
 	"github.com/containerd/log"
 	"github.com/sirupsen/logrus"

runtime/v2/shim/util_unix.go

@@ -32,7 +32,7 @@ import (
 
 	"github.com/containerd/containerd/v2/defaults"
 	"github.com/containerd/containerd/v2/pkg/namespaces"
-	"github.com/containerd/containerd/v2/sys"
+	"github.com/containerd/containerd/v2/pkg/sys"
 )
 
 const (