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

Initial commit of libcontainer running docker

Browse source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-02-21 17:11:57 -08:00
parent fa64bff715
commit d2fa488fa2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libcontainer/nsinit/exec.go
View file

@ -227,7 +227,7 @@ func createCommand(container *libcontainer.Container, console, logFile string, p
"init"}, args...)...) "init"}, args...)...)
command.SysProcAttr = &syscall.SysProcAttr{ command.SysProcAttr = &syscall.SysProcAttr{
Cloneflags: uintptr(getNamespaceFlags(container.Namespaces)), Cloneflags: uintptr(GetNamespaceFlags(container.Namespaces)),
} }
command.Env = container.Env command.Env = container.Env
return command return command

2
libcontainer/nsinit/ns_linux.go
View file

@ -28,7 +28,7 @@ var namespaceFileMap = map[libcontainer.Namespace]string{
// getNamespaceFlags parses the container's Namespaces options to set the correct // getNamespaceFlags parses the container's Namespaces options to set the correct
// flags on clone, unshare, and setns // flags on clone, unshare, and setns
func getNamespaceFlags(namespaces libcontainer.Namespaces) (flag int) { func GetNamespaceFlags(namespaces libcontainer.Namespaces) (flag int) {
for _, ns := range namespaces { for _, ns := range namespaces {
flag |= namespaceMap[ns] flag |= namespaceMap[ns]
} }