vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Factor out finalize namespace

Browse source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-03-03 12:15:47 -08:00
parent ab952e2502
commit 7dc071dca5
2 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libcontainer/nsinit/execin.go
View file

@ -5,7 +5,6 @@ package nsinit
import (
"fmt"
"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/capabilities"
"github.com/dotcloud/docker/pkg/system"
"os"
"path/filepath"
@ -73,8 +72,8 @@ func (ns *linuxNs) ExecIn(container *libcontainer.Container, nspid int, args []s
os.Exit(state.Sys().(syscall.WaitStatus).ExitStatus())
}
dropAndExec:
if err := capabilities.DropCapabilities(container); err != nil {
return -1, fmt.Errorf("drop capabilities %s", err)
if err := finalizeNamespace(container); err != nil {
return -1, err
}
if err := system.Execv(args[0], args[0:], container.Env); err != nil {
return -1, err