Skip to content

Commit

Permalink
Merge pull request #1442 from clnperez/libcontainer-sys-unix
Browse files Browse the repository at this point in the history
Move libcontainer to x/sys/unix
  • Loading branch information
dqminh authored May 26, 2017
2 parents d7c264a + 9ed7e9b commit 67bd2ab
Show file tree
Hide file tree
Showing 40 changed files with 649 additions and 651 deletions.
5 changes: 3 additions & 2 deletions checkpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ import (
"fmt"
"strconv"
"strings"
"syscall"

"github.com/opencontainers/runc/libcontainer"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/urfave/cli"

"golang.org/x/sys/unix"
)

var checkpointCommand = cli.Command{
Expand Down Expand Up @@ -113,7 +114,7 @@ func setManageCgroupsMode(context *cli.Context, options *libcontainer.CriuOpts)
}

var namespaceMapping = map[specs.LinuxNamespaceType]int{
specs.NetworkNamespace: syscall.CLONE_NEWNET,
specs.NetworkNamespace: unix.CLONE_NEWNET,
}

func setEmptyNsMask(context *cli.Context, options *libcontainer.CriuOpts) error {
Expand Down
Loading

0 comments on commit 67bd2ab

Please sign in to comment.