From ea6e255f4538596a946c7939eed8ce4b73bdb535 Mon Sep 17 00:00:00 2001 From: Paul Morie Date: Sun, 13 Jul 2014 17:03:29 -0400 Subject: [PATCH] Remove unused arg from namespaces.NsEnter Docker-DCO-1.1-Signed-off-by: Paul Morie (github: pmorie) --- namespaces/execin.go | 4 ++-- nsinit/nsenter.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/namespaces/execin.go b/namespaces/execin.go index d349282e8..3e79f4cda 100644 --- a/namespaces/execin.go +++ b/namespaces/execin.go @@ -30,8 +30,8 @@ func ExecIn(container *libcontainer.Config, state *libcontainer.State, args []st panic("unreachable") } -// NsEnter is run after entering the namespace. -func NsEnter(container *libcontainer.Config, nspid int, args []string) error { +// Run a command in a container after entering the namespace. +func NsEnter(container *libcontainer.Config, args []string) error { // clear the current processes env and replace it with the environment // defined on the container if err := LoadContainerEnvironment(container); err != nil { diff --git a/nsinit/nsenter.go b/nsinit/nsenter.go index d3df4f666..743b20a92 100644 --- a/nsinit/nsenter.go +++ b/nsinit/nsenter.go @@ -34,7 +34,7 @@ func nsenterAction(context *cli.Context) { log.Fatalf("cannot enter into namespaces without valid pid: %q", nspid) } - if err := namespaces.NsEnter(container, nspid, args); err != nil { + if err := namespaces.NsEnter(container, args); err != nil { log.Fatalf("failed to nsenter: %s", err) } }