1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

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
commit 3782900405

View file

@ -14,12 +14,14 @@ import (
// 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) {
ns.logger.Println("unshare namespaces")
for _, ns := range container.Namespaces {
if err := system.Unshare(ns.Value); err != nil {
for _, nsv := range container.Namespaces {
// skip the PID namespace on unshare because it it not supported
if nsv.Key != "NEWPID" {
if err := system.Unshare(nsv.Value); err != nil {
return -1, err
}
}
}
fds, err := ns.getNsFds(nspid, container)
closeFds := func() {
for _, f := range fds {