Merge pull request openshift#88 from pmorie/master

Remove unused arg from namespaces.NsEnter
pmorie · Jul 14, 2014 · af4d853 · af4d853
2 parents 8c0303d + ea6e255
commit af4d853
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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)
 	}
 }