From de606680b03fa7b759af96ece8717fbf13a44543 Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Wed, 17 Jan 2024 09:56:07 -0800 Subject: [PATCH] Move rootfs to pkg/rootfs Signed-off-by: Derek McGowan --- client/container_checkpoint_opts.go | 2 +- client/image.go | 2 +- client/task.go | 2 +- cmd/ctr/commands/snapshots/snapshots.go | 2 +- {rootfs => pkg/rootfs}/apply.go | 0 {rootfs => pkg/rootfs}/diff.go | 0 {rootfs => pkg/rootfs}/init.go | 0 {rootfs => pkg/rootfs}/init_linux.go | 0 {rootfs => pkg/rootfs}/init_other.go | 0 9 files changed, 4 insertions(+), 4 deletions(-) rename {rootfs => pkg/rootfs}/apply.go (100%) rename {rootfs => pkg/rootfs}/diff.go (100%) rename {rootfs => pkg/rootfs}/init.go (100%) rename {rootfs => pkg/rootfs}/init_linux.go (100%) rename {rootfs => pkg/rootfs}/init_other.go (100%) diff --git a/client/container_checkpoint_opts.go b/client/container_checkpoint_opts.go index 27056cd8d..5c5e758d3 100644 --- a/client/container_checkpoint_opts.go +++ b/client/container_checkpoint_opts.go @@ -27,10 +27,10 @@ import ( "github.com/containerd/containerd/v2/core/containers" "github.com/containerd/containerd/v2/core/diff" "github.com/containerd/containerd/v2/core/images" + "github.com/containerd/containerd/v2/pkg/rootfs" "github.com/containerd/containerd/v2/platforms" "github.com/containerd/containerd/v2/protobuf" "github.com/containerd/containerd/v2/protobuf/proto" - "github.com/containerd/containerd/v2/rootfs" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/opencontainers/go-digest" imagespec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/client/image.go b/client/image.go index 5924b47c3..7184a3c46 100644 --- a/client/image.go +++ b/client/image.go @@ -31,8 +31,8 @@ import ( "github.com/containerd/containerd/v2/pkg/errdefs" "github.com/containerd/containerd/v2/pkg/kmutex" "github.com/containerd/containerd/v2/pkg/labels" + "github.com/containerd/containerd/v2/pkg/rootfs" "github.com/containerd/containerd/v2/platforms" - "github.com/containerd/containerd/v2/rootfs" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/client/task.go b/client/task.go index 829e42791..0b2b14657 100644 --- a/client/task.go +++ b/client/task.go @@ -35,10 +35,10 @@ 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/rootfs" "github.com/containerd/containerd/v2/plugins" "github.com/containerd/containerd/v2/protobuf" google_protobuf "github.com/containerd/containerd/v2/protobuf/types" - "github.com/containerd/containerd/v2/rootfs" "github.com/containerd/containerd/v2/runtime/v2/runc/options" "github.com/containerd/typeurl/v2" digest "github.com/opencontainers/go-digest" diff --git a/cmd/ctr/commands/snapshots/snapshots.go b/cmd/ctr/commands/snapshots/snapshots.go index aa95e9682..9501b3d09 100644 --- a/cmd/ctr/commands/snapshots/snapshots.go +++ b/cmd/ctr/commands/snapshots/snapshots.go @@ -34,7 +34,7 @@ import ( "github.com/containerd/containerd/v2/core/mount" "github.com/containerd/containerd/v2/core/snapshots" "github.com/containerd/containerd/v2/pkg/progress" - "github.com/containerd/containerd/v2/rootfs" + "github.com/containerd/containerd/v2/pkg/rootfs" "github.com/containerd/log" digest "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/rootfs/apply.go b/pkg/rootfs/apply.go similarity index 100% rename from rootfs/apply.go rename to pkg/rootfs/apply.go diff --git a/rootfs/diff.go b/pkg/rootfs/diff.go similarity index 100% rename from rootfs/diff.go rename to pkg/rootfs/diff.go diff --git a/rootfs/init.go b/pkg/rootfs/init.go similarity index 100% rename from rootfs/init.go rename to pkg/rootfs/init.go diff --git a/rootfs/init_linux.go b/pkg/rootfs/init_linux.go similarity index 100% rename from rootfs/init_linux.go rename to pkg/rootfs/init_linux.go diff --git a/rootfs/init_other.go b/pkg/rootfs/init_other.go similarity index 100% rename from rootfs/init_other.go rename to pkg/rootfs/init_other.go