jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #88 from pmorie/master 

Remove unused arg from namespaces.NsEnter
This commit is contained in:
Michael Crosby 2014-07-14 10:39:35 -07:00
parent 8c0303d928 ea6e255f45
commit af4d853c19
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
namespaces/execin.go
View File

@ -30,8 +30,8 @@ func ExecIn(container *libcontainer.Config, state *libcontainer.State, args []st
panic("unreachable") panic("unreachable")
} }
// NsEnter is run after entering the namespace. // Run a command in a container after entering the namespace.
func NsEnter(container *libcontainer.Config, nspid int, args []string) error { func NsEnter(container *libcontainer.Config, args []string) error {
// clear the current processes env and replace it with the environment // clear the current processes env and replace it with the environment
// defined on the container // defined on the container
if err := LoadContainerEnvironment(container); err != nil { if err := LoadContainerEnvironment(container); err != nil {

2
nsinit/nsenter.go
View File

@ -34,7 +34,7 @@ func nsenterAction(context *cli.Context) {
log.Fatalf("cannot enter into namespaces without valid pid: %q", nspid) 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) log.Fatalf("failed to nsenter: %s", err)
} }
} }