From 4c55306c3d0e32a06e578b0767c044bbd11771ff Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 3 Jun 2021 22:43:10 +0200 Subject: [PATCH] use consistent alias for criu rpc Signed-off-by: Sebastiaan van Stijn --- checkpoint.go | 8 ++++---- libcontainer/criu_opts_linux.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/checkpoint.go b/checkpoint.go index 32a62a8bcb2..556b19cd6e9 100644 --- a/checkpoint.go +++ b/checkpoint.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strconv" - criu "github.com/checkpoint-restore/go-criu/v5/rpc" + criurpc "github.com/checkpoint-restore/go-criu/v5/rpc" "github.com/opencontainers/runc/libcontainer" "github.com/opencontainers/runc/libcontainer/userns" "github.com/opencontainers/runtime-spec/specs-go" @@ -133,11 +133,11 @@ func setManageCgroupsMode(context *cli.Context, options *libcontainer.CriuOpts) if cgOpt := context.String("manage-cgroups-mode"); cgOpt != "" { switch cgOpt { case "soft": - options.ManageCgroupsMode = criu.CriuCgMode_SOFT + options.ManageCgroupsMode = criurpc.CriuCgMode_SOFT case "full": - options.ManageCgroupsMode = criu.CriuCgMode_FULL + options.ManageCgroupsMode = criurpc.CriuCgMode_FULL case "strict": - options.ManageCgroupsMode = criu.CriuCgMode_STRICT + options.ManageCgroupsMode = criurpc.CriuCgMode_STRICT default: fatal(errors.New("Invalid manage cgroups mode")) } diff --git a/libcontainer/criu_opts_linux.go b/libcontainer/criu_opts_linux.go index b39476ef352..56b869fb7a8 100644 --- a/libcontainer/criu_opts_linux.go +++ b/libcontainer/criu_opts_linux.go @@ -1,6 +1,6 @@ package libcontainer -import criu "github.com/checkpoint-restore/go-criu/v5/rpc" +import criurpc "github.com/checkpoint-restore/go-criu/v5/rpc" type CriuPageServerInfo struct { Address string // IP address of CRIU page server @@ -24,7 +24,7 @@ type CriuOpts struct { PreDump bool // call criu predump to perform iterative checkpoint PageServer CriuPageServerInfo // allow to dump to criu page server VethPairs []VethPairName // pass the veth to criu when restore - ManageCgroupsMode criu.CriuCgMode // dump or restore cgroup mode + ManageCgroupsMode criurpc.CriuCgMode // dump or restore cgroup mode EmptyNs uint32 // don't c/r properties for namespace from this mask AutoDedup bool // auto deduplication for incremental dumps LazyPages bool // restore memory pages lazily using userfaultfd