diff --git a/libnetwork/namespace.go b/libnetwork/namespace.go index 263a51d6ad..99607a090c 100644 --- a/libnetwork/namespace.go +++ b/libnetwork/namespace.go @@ -7,14 +7,14 @@ type networkNamespace struct { // Create a new network namespace mounted on the provided path. func NewNamespace(path string) (Namespace, error) { - if err := Reexec(ReexecCreateNamespace, path); err != nil { + if err := reexec(reexecCreateNamespace, path); err != nil { return nil, err } return &networkNamespace{path: path}, nil } func (n *networkNamespace) AddInterface(i *Interface) error { - if err := Reexec(ReexecMoveInterface, i.SrcName, i.DstName); err != nil { + if err := reexec(reexecMoveInterface, i.SrcName, i.DstName); err != nil { return err } n.interfaces = append(n.interfaces, i) diff --git a/libnetwork/reexec.go b/libnetwork/reexec.go index b06d4303c1..0da21c62e6 100644 --- a/libnetwork/reexec.go +++ b/libnetwork/reexec.go @@ -5,38 +5,38 @@ import ( "os" "os/exec" - "github.com/docker/docker/pkg/reexec" + dre "github.com/docker/docker/pkg/reexec" ) -type ReexecCommand int +type reexecCommand int const ( - ReexecCreateNamespace ReexecCommand = iota - ReexecMoveInterface + reexecCreateNamespace reexecCommand = iota + reexecMoveInterface ) -var ReexecCommands = map[ReexecCommand]struct { +var reexecCommands = map[reexecCommand]struct { Key string Entrypoint func() }{ - ReexecCreateNamespace: {"netns-create", createNetworkNamespace}, - ReexecMoveInterface: {"netns-moveif", namespaceMoveInterface}, + reexecCreateNamespace: {"netns-create", createNetworkNamespace}, + reexecMoveInterface: {"netns-moveif", namespaceMoveInterface}, } func init() { - for _, reexecCmd := range ReexecCommands { - reexec.Register(reexecCmd.Key, reexecCmd.Entrypoint) + for _, reexecCmd := range reexecCommands { + dre.Register(reexecCmd.Key, reexecCmd.Entrypoint) } } -func Reexec(command ReexecCommand, params ...string) error { - reexecCommand, ok := ReexecCommands[command] +func reexec(command reexecCommand, params ...string) error { + reexecCommand, ok := reexecCommands[command] if !ok { return fmt.Errorf("unknown reexec command %q", command) } cmd := &exec.Cmd{ - Path: reexec.Self(), + Path: dre.Self(), Args: append([]string{reexecCommand.Key}, params...), Stdout: os.Stdout, Stderr: os.Stderr,