Skip to content

Commit

Permalink
Purge the bits of pkg/system that moved to libcontainer/system
Browse files Browse the repository at this point in the history
Signed-off-by: Andrew Page <admwiggin@gmail.com>
  • Loading branch information
tianon committed Aug 2, 2014
1 parent bec676e commit 60341f8
Show file tree
Hide file tree
Showing 10 changed files with 7 additions and 398 deletions.
2 changes: 1 addition & 1 deletion daemon/execdriver/lxc/lxc_init_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (

"github.com/docker/docker/daemon/execdriver"
"github.com/docker/docker/daemon/execdriver/native/template"
"github.com/docker/docker/pkg/system"
"github.com/docker/libcontainer/namespaces"
"github.com/docker/libcontainer/security/capabilities"
"github.com/docker/libcontainer/system"
"github.com/docker/libcontainer/utils"
)

Expand Down
10 changes: 6 additions & 4 deletions daemon/execdriver/native/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@ import (
"syscall"

"github.com/docker/docker/daemon/execdriver"
"github.com/docker/docker/pkg/system"
"github.com/docker/docker/pkg/term"
"github.com/docker/libcontainer"
"github.com/docker/libcontainer/apparmor"
"github.com/docker/libcontainer/cgroups/fs"
"github.com/docker/libcontainer/cgroups/systemd"
consolepkg "github.com/docker/libcontainer/console"
"github.com/docker/libcontainer/namespaces"
"github.com/docker/libcontainer/syncpipe"
"github.com/docker/libcontainer/system"
)

const (
Expand Down Expand Up @@ -143,8 +144,9 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
}, args...)

// set this to nil so that when we set the clone flags anything else is reset
c.SysProcAttr = nil
system.SetCloneFlags(&c.Cmd, uintptr(namespaces.GetNamespaceFlags(container.Namespaces)))
c.SysProcAttr = &syscall.SysProcAttr{
Cloneflags: uintptr(namespaces.GetNamespaceFlags(container.Namespaces)),
}
c.ExtraFiles = []*os.File{child}

c.Env = container.Env
Expand Down Expand Up @@ -285,7 +287,7 @@ type TtyConsole struct {
}

func NewTtyConsole(command *execdriver.Command, pipes *execdriver.Pipes) (*TtyConsole, error) {
ptyMaster, console, err := system.CreateMasterAndConsole()
ptyMaster, console, err := consolepkg.CreateMasterAndConsole()
if err != nil {
return nil, err
}
Expand Down
185 changes: 0 additions & 185 deletions pkg/system/calls_linux.go

This file was deleted.

38 changes: 0 additions & 38 deletions pkg/system/fds_linux.go

This file was deleted.

12 changes: 0 additions & 12 deletions pkg/system/fds_unsupported.go

This file was deleted.

26 changes: 0 additions & 26 deletions pkg/system/proc.go

This file was deleted.

58 changes: 0 additions & 58 deletions pkg/system/pty_linux.go

This file was deleted.

0 comments on commit 60341f8

Please sign in to comment.