docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4731 from crosbymichael/fix-execin 

Only unshare the mount namespace for execin
This commit is contained in:
Michael Crosby 2014-03-17 18:59:26 -07:00
parent 68dc189680 4b1513f9c3
commit 3782900405
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/libcontainer/nsinit/execin.go
View File

@ -14,12 +14,14 @@ import (
// ExecIn uses an existing pid and joins the pid's namespaces with the new command. // ExecIn uses an existing pid and joins the pid's namespaces with the new command.
func (ns *linuxNs) ExecIn(container *libcontainer.Container, nspid int, args []string) (int, error) { func (ns *linuxNs) ExecIn(container *libcontainer.Container, nspid int, args []string) (int, error) {
ns.logger.Println("unshare namespaces") for _, nsv := range container.Namespaces {
for _, ns := range container.Namespaces { // skip the PID namespace on unshare because it it not supported
if err := system.Unshare(ns.Value); err != nil { if nsv.Key != "NEWPID" {
if err := system.Unshare(nsv.Value); err != nil {
return -1, err return -1, err
} }
} }
}
fds, err := ns.getNsFds(nspid, container) fds, err := ns.getNsFds(nspid, container)
closeFds := func() { closeFds := func() {
for _, f := range fds { for _, f := range fds {