diff --git a/cmd/containerd-shim-runc-v2/manager/manager_linux.go b/cmd/containerd-shim-runc-v2/manager/manager_linux.go index 4d9ef6296..9f5f81489 100644 --- a/cmd/containerd-shim-runc-v2/manager/manager_linux.go +++ b/cmd/containerd-shim-runc-v2/manager/manager_linux.go @@ -30,11 +30,11 @@ import ( "github.com/containerd/cgroups/v3" "github.com/containerd/cgroups/v3/cgroup1" cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" + "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/oci" - "github.com/containerd/containerd/v2/pkg/process" "github.com/containerd/containerd/v2/pkg/schedcore" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/containerd/v2/runtime/v2/shim" diff --git a/pkg/process/deleted_state.go b/cmd/containerd-shim-runc-v2/process/deleted_state.go similarity index 100% rename from pkg/process/deleted_state.go rename to cmd/containerd-shim-runc-v2/process/deleted_state.go diff --git a/pkg/process/exec.go b/cmd/containerd-shim-runc-v2/process/exec.go similarity index 100% rename from pkg/process/exec.go rename to cmd/containerd-shim-runc-v2/process/exec.go diff --git a/pkg/process/exec_state.go b/cmd/containerd-shim-runc-v2/process/exec_state.go similarity index 100% rename from pkg/process/exec_state.go rename to cmd/containerd-shim-runc-v2/process/exec_state.go diff --git a/pkg/process/init.go b/cmd/containerd-shim-runc-v2/process/init.go similarity index 100% rename from pkg/process/init.go rename to cmd/containerd-shim-runc-v2/process/init.go diff --git a/pkg/process/init_state.go b/cmd/containerd-shim-runc-v2/process/init_state.go similarity index 100% rename from pkg/process/init_state.go rename to cmd/containerd-shim-runc-v2/process/init_state.go diff --git a/pkg/process/io.go b/cmd/containerd-shim-runc-v2/process/io.go similarity index 100% rename from pkg/process/io.go rename to cmd/containerd-shim-runc-v2/process/io.go diff --git a/pkg/process/io_test.go b/cmd/containerd-shim-runc-v2/process/io_test.go similarity index 100% rename from pkg/process/io_test.go rename to cmd/containerd-shim-runc-v2/process/io_test.go diff --git a/pkg/process/io_util.go b/cmd/containerd-shim-runc-v2/process/io_util.go similarity index 100% rename from pkg/process/io_util.go rename to cmd/containerd-shim-runc-v2/process/io_util.go diff --git a/pkg/process/process.go b/cmd/containerd-shim-runc-v2/process/process.go similarity index 100% rename from pkg/process/process.go rename to cmd/containerd-shim-runc-v2/process/process.go diff --git a/pkg/process/types.go b/cmd/containerd-shim-runc-v2/process/types.go similarity index 100% rename from pkg/process/types.go rename to cmd/containerd-shim-runc-v2/process/types.go diff --git a/pkg/process/utils.go b/cmd/containerd-shim-runc-v2/process/utils.go similarity index 100% rename from pkg/process/utils.go rename to cmd/containerd-shim-runc-v2/process/utils.go diff --git a/cmd/containerd-shim-runc-v2/runc/container.go b/cmd/containerd-shim-runc-v2/runc/container.go index 4f36e8d9e..a0173a4bf 100644 --- a/cmd/containerd-shim-runc-v2/runc/container.go +++ b/cmd/containerd-shim-runc-v2/runc/container.go @@ -31,10 +31,10 @@ import ( cgroupsv2 "github.com/containerd/cgroups/v3/cgroup2" "github.com/containerd/console" "github.com/containerd/containerd/v2/api/runtime/task/v3" + "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/mount" "github.com/containerd/containerd/v2/namespaces" - "github.com/containerd/containerd/v2/pkg/process" "github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/log" diff --git a/cmd/containerd-shim-runc-v2/runc/platform.go b/cmd/containerd-shim-runc-v2/runc/platform.go index b50a37419..8b0a75891 100644 --- a/cmd/containerd-shim-runc-v2/runc/platform.go +++ b/cmd/containerd-shim-runc-v2/runc/platform.go @@ -29,8 +29,8 @@ import ( "syscall" "github.com/containerd/console" + "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process" "github.com/containerd/containerd/v2/namespaces" - "github.com/containerd/containerd/v2/pkg/process" "github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/fifo" ) diff --git a/cmd/containerd-shim-runc-v2/task/service.go b/cmd/containerd-shim-runc-v2/task/service.go index 144b4268a..37a0e1e48 100644 --- a/cmd/containerd-shim-runc-v2/task/service.go +++ b/cmd/containerd-shim-runc-v2/task/service.go @@ -30,13 +30,13 @@ import ( eventstypes "github.com/containerd/containerd/v2/api/events" taskAPI "github.com/containerd/containerd/v2/api/runtime/task/v3" "github.com/containerd/containerd/v2/api/types/task" + "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/process" "github.com/containerd/containerd/v2/cmd/containerd-shim-runc-v2/runc" "github.com/containerd/containerd/v2/errdefs" "github.com/containerd/containerd/v2/namespaces" "github.com/containerd/containerd/v2/pkg/oom" oomv1 "github.com/containerd/containerd/v2/pkg/oom/v1" oomv2 "github.com/containerd/containerd/v2/pkg/oom/v2" - "github.com/containerd/containerd/v2/pkg/process" "github.com/containerd/containerd/v2/pkg/shutdown" "github.com/containerd/containerd/v2/pkg/stdio" "github.com/containerd/containerd/v2/pkg/userns"