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

Rename nsinit package to namespaces in libcontainer

Browse source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-06-04 15:47:57 -07:00
parent 048833c246
commit 8aff01c0b4
12 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
daemon/execdriver/native/driver.go
View file

@ -16,7 +16,7 @@ import (
"github.com/dotcloud/docker/pkg/libcontainer" "github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups/fs" "github.com/dotcloud/docker/pkg/libcontainer/cgroups/fs"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups/systemd" "github.com/dotcloud/docker/pkg/libcontainer/cgroups/systemd"
"github.com/dotcloud/docker/pkg/libcontainer/nsinit" "github.com/dotcloud/docker/pkg/libcontainer/namespaces"
"github.com/dotcloud/docker/pkg/system" "github.com/dotcloud/docker/pkg/system"
) )
@ -42,11 +42,11 @@ func init() {
if err != nil { if err != nil {
return err return err
} }
syncPipe, err := nsinit.NewSyncPipeFromFd(0, uintptr(args.Pipe)) syncPipe, err := namespaces.NewSyncPipeFromFd(0, uintptr(args.Pipe))
if err != nil { if err != nil {
return err return err
} }
if err := nsinit.Init(container, rootfs, args.Console, syncPipe, args.Args); err != nil { if err := namespaces.Init(container, rootfs, args.Console, syncPipe, args.Args); err != nil {
return err return err
} }
return nil return nil
@ -110,8 +110,8 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
term := getTerminal(c, pipes) term := getTerminal(c, pipes)
return nsinit.Exec(container, term, c.Rootfs, dataPath, args, func(container *libcontainer.Container, console, rootfs, dataPath, init string, child *os.File, args []string) *exec.Cmd { return namespaces.Exec(container, term, c.Rootfs, dataPath, args, func(container *libcontainer.Container, console, rootfs, dataPath, init string, child *os.File, args []string) *exec.Cmd {
// we need to join the rootfs because nsinit will setup the rootfs and chroot // we need to join the rootfs because namespaces will setup the rootfs and chroot
initPath := filepath.Join(c.Rootfs, c.InitPath) initPath := filepath.Join(c.Rootfs, c.InitPath)
c.Path = d.initPath c.Path = d.initPath
@ -126,7 +126,7 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
// set this to nil so that when we set the clone flags anything else is reset // set this to nil so that when we set the clone flags anything else is reset
c.SysProcAttr = nil c.SysProcAttr = nil
system.SetCloneFlags(&c.Cmd, uintptr(nsinit.GetNamespaceFlags(container.Namespaces))) system.SetCloneFlags(&c.Cmd, uintptr(namespaces.GetNamespaceFlags(container.Namespaces)))
c.ExtraFiles = []*os.File{child} c.ExtraFiles = []*os.File{child}
c.Env = container.Env c.Env = container.Env
@ -258,8 +258,8 @@ func getEnv(key string, env []string) string {
return "" return ""
} }
func getTerminal(c *execdriver.Command, pipes *execdriver.Pipes) nsinit.Terminal { func getTerminal(c *execdriver.Command, pipes *execdriver.Pipes) namespaces.Terminal {
var term nsinit.Terminal var term namespaces.Terminal
if c.Tty { if c.Tty {
term = &dockerTtyTerm{ term = &dockerTtyTerm{
pipes: pipes, pipes: pipes,

2
pkg/libcontainer/nsinit/create.go → pkg/libcontainer/namespaces/create.go
View file

@ -1,4 +1,4 @@
package nsinit package namespaces
import ( import (
"os" "os"

2
pkg/libcontainer/nsinit/exec.go → pkg/libcontainer/namespaces/exec.go
View file

@ -1,6 +1,6 @@
// +build linux // +build linux
package nsinit package namespaces
import ( import (
"os" "os"

2
pkg/libcontainer/nsinit/execin.go → pkg/libcontainer/namespaces/execin.go
View file

@ -1,6 +1,6 @@
// +build linux // +build linux
package nsinit package namespaces
import ( import (
"fmt" "fmt"

2
pkg/libcontainer/nsinit/init.go → pkg/libcontainer/namespaces/init.go
View file

@ -1,6 +1,6 @@
// +build linux // +build linux
package nsinit package namespaces
import ( import (
"fmt" "fmt"

2
pkg/libcontainer/nsinit/pid.go → pkg/libcontainer/namespaces/pid.go
View file

@ -1,4 +1,4 @@
package nsinit package namespaces
import ( import (
"fmt" "fmt"

2
pkg/libcontainer/nsinit/std_term.go → pkg/libcontainer/namespaces/std_term.go
View file

@ -1,4 +1,4 @@
package nsinit package namespaces
import ( import (
"io" "io"

2
pkg/libcontainer/nsinit/sync_pipe.go → pkg/libcontainer/namespaces/sync_pipe.go
View file

@ -1,4 +1,4 @@
package nsinit package namespaces
import ( import (
"encoding/json" "encoding/json"

2
pkg/libcontainer/nsinit/term.go → pkg/libcontainer/namespaces/term.go
View file

@ -1,4 +1,4 @@
package nsinit package namespaces
import ( import (
"io" "io"

2
pkg/libcontainer/nsinit/tty_term.go → pkg/libcontainer/namespaces/tty_term.go
View file

@ -1,4 +1,4 @@
package nsinit package namespaces
import ( import (
"io" "io"

2
pkg/libcontainer/nsinit/unsupported.go → pkg/libcontainer/namespaces/unsupported.go
View file

@ -1,6 +1,6 @@
// +build !linux // +build !linux
package nsinit package namespaces
import ( import (
"github.com/dotcloud/docker/pkg/libcontainer" "github.com/dotcloud/docker/pkg/libcontainer"

16
pkg/libcontainer/nsinit/nsinit/main.go → pkg/libcontainer/nsinit/main.go
View file

@ -13,7 +13,7 @@ import (
"github.com/dotcloud/docker/pkg/libcontainer" "github.com/dotcloud/docker/pkg/libcontainer"
"github.com/dotcloud/docker/pkg/libcontainer/cgroups/fs" "github.com/dotcloud/docker/pkg/libcontainer/cgroups/fs"
"github.com/dotcloud/docker/pkg/libcontainer/nsinit" "github.com/dotcloud/docker/pkg/libcontainer/namespaces"
) )
var ( var (
@ -40,9 +40,9 @@ func main() {
} }
if nspid > 0 { if nspid > 0 {
exitCode, err = nsinit.ExecIn(container, nspid, os.Args[2:]) exitCode, err = namespaces.ExecIn(container, nspid, os.Args[2:])
} else { } else {
term := nsinit.NewTerminal(os.Stdin, os.Stdout, os.Stderr, container.Tty) term := namespaces.NewTerminal(os.Stdin, os.Stdout, os.Stderr, container.Tty)
exitCode, err = startContainer(container, term, dataPath, os.Args[2:]) exitCode, err = startContainer(container, term, dataPath, os.Args[2:])
} }
@ -61,12 +61,12 @@ func main() {
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
syncPipe, err := nsinit.NewSyncPipeFromFd(0, uintptr(pipeFd)) syncPipe, err := namespaces.NewSyncPipeFromFd(0, uintptr(pipeFd))
if err != nil { if err != nil {
log.Fatalf("unable to create sync pipe: %s", err) log.Fatalf("unable to create sync pipe: %s", err)
} }
if err := nsinit.Init(container, rootfs, console, syncPipe, os.Args[2:]); err != nil { if err := namespaces.Init(container, rootfs, console, syncPipe, os.Args[2:]); err != nil {
log.Fatalf("unable to initialize for container: %s", err) log.Fatalf("unable to initialize for container: %s", err)
} }
case "stats": case "stats":
@ -124,7 +124,7 @@ func readPid() (int, error) {
// error. // error.
// //
// Signals sent to the current process will be forwarded to container. // Signals sent to the current process will be forwarded to container.
func startContainer(container *libcontainer.Container, term nsinit.Terminal, dataPath string, args []string) (int, error) { func startContainer(container *libcontainer.Container, term namespaces.Terminal, dataPath string, args []string) (int, error) {
var ( var (
cmd *exec.Cmd cmd *exec.Cmd
sigc = make(chan os.Signal, 10) sigc = make(chan os.Signal, 10)
@ -133,7 +133,7 @@ func startContainer(container *libcontainer.Container, term nsinit.Terminal, dat
signal.Notify(sigc) signal.Notify(sigc)
createCommand := func(container *libcontainer.Container, console, rootfs, dataPath, init string, pipe *os.File, args []string) *exec.Cmd { createCommand := func(container *libcontainer.Container, console, rootfs, dataPath, init string, pipe *os.File, args []string) *exec.Cmd {
cmd = nsinit.DefaultCreateCommand(container, console, rootfs, dataPath, init, pipe, args) cmd = namespaces.DefaultCreateCommand(container, console, rootfs, dataPath, init, pipe, args)
return cmd return cmd
} }
@ -145,7 +145,7 @@ func startContainer(container *libcontainer.Container, term nsinit.Terminal, dat
}() }()
} }
return nsinit.Exec(container, term, "", dataPath, args, createCommand, startCallback) return namespaces.Exec(container, term, "", dataPath, args, createCommand, startCallback)
} }
// returns the container stats in json format. // returns the container stats in json format.