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

Refactor mounts into pkg to make changes easier

Browse source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-04-11 15:06:56 +00:00
parent 323ea01c18
commit a77846506b
9 changed files with 191 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libcontainer/nsinit/init.go
View file

@ -12,6 +12,7 @@ import (
"github.com/dotcloud/docker/pkg/label"
"github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/capabilities"
"github.com/dotcloud/docker/pkg/libcontainer/mount"
"github.com/dotcloud/docker/pkg/libcontainer/network"
"github.com/dotcloud/docker/pkg/libcontainer/security/apparmor"
"github.com/dotcloud/docker/pkg/libcontainer/utils"
@ -61,7 +62,7 @@ func (ns *linuxNs) Init(container *libcontainer.Container, uncleanRootfs, consol
label.Init()
ns.logger.Println("setup mount namespace")
if err := setupNewMountNamespace(rootfs, console, container); err != nil {
if err := mount.InitializeMountNamespace(rootfs, console, container); err != nil {
return fmt.Errorf("setup mount namespace %s", err)
}
if err := system.Sethostname(container.Hostname); err != nil {