toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update close fd issues for lxc

Browse Source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 707ef9618b3b26a0534a0af732a22f159eccfaa5
Component: engine
This commit is contained in:
Michael Crosby
2014-06-19 11:57:09 -07:00
committed by Dinesh Subhraveti
parent 1316dc9e2d
commit 16f6e09488
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/engine/daemon/execdriver/lxc/driver.go
View File

@ -19,7 +19,6 @@ import (
"github.com/docker/libcontainer/label"
"github.com/docker/libcontainer/mount/nodes"
"github.com/dotcloud/docker/daemon/execdriver"
"github.com/dotcloud/docker/pkg/system"
"github.com/dotcloud/docker/utils"
)
@ -37,12 +36,6 @@ func init() {
if err := setupNetworking(args); err != nil {
return err
}
if err := setupWorkingDirectory(args); err != nil {
return err
}
if err := system.CloseFdsFrom(3); err != nil {
return err
}
if err := finalizeNamespace(args); err != nil {
return err
}

9
components/engine/daemon/execdriver/lxc/lxc_init_linux.go
View File

@ -8,6 +8,7 @@ import (
"github.com/docker/libcontainer/namespaces"
"github.com/docker/libcontainer/security/capabilities"
"github.com/docker/libcontainer/utils"
"github.com/dotcloud/docker/daemon/execdriver"
"github.com/dotcloud/docker/daemon/execdriver/native/template"
"github.com/dotcloud/docker/pkg/system"
@ -18,6 +19,10 @@ func setHostname(hostname string) error {
}
func finalizeNamespace(args *execdriver.InitArgs) error {
if err := utils.CloseExecFrom(3); err != nil {
return err
}
// We use the native drivers default template so that things like caps are consistent
// across both drivers
container := template.New()
@ -49,5 +54,9 @@ func finalizeNamespace(args *execdriver.InitArgs) error {
}
}
if err := setupWorkingDirectory(args); err != nil {
return err
}
return nil
}