diff --git a/execdriver/lxc/driver.go b/execdriver/lxc/driver.go index 5be7ad2219..145965a383 100644 --- a/execdriver/lxc/driver.go +++ b/execdriver/lxc/driver.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/dotcloud/docker/execdriver" "github.com/dotcloud/docker/pkg/cgroups" + "github.com/dotcloud/docker/pkg/term" "github.com/dotcloud/docker/utils" "io/ioutil" "log" @@ -77,7 +78,7 @@ func (d *driver) Name() string { } func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallback execdriver.StartCallback) (int, error) { - if err := SetTerminal(c, pipes); err != nil { + if err := term.SetTerminal(c, pipes); err != nil { return -1, err } configPath, err := d.generateLXCConfig(c) diff --git a/execdriver/lxc/term.go b/pkg/term/driver.go similarity index 94% rename from execdriver/lxc/term.go rename to pkg/term/driver.go index d772f60972..6e1fae41ba 100644 --- a/execdriver/lxc/term.go +++ b/pkg/term/driver.go @@ -1,8 +1,7 @@ -package lxc +package term import ( "github.com/dotcloud/docker/execdriver" - "github.com/dotcloud/docker/pkg/term" "github.com/kr/pty" "io" "os" @@ -51,7 +50,7 @@ func (t *TtyConsole) Master() *os.File { } func (t *TtyConsole) Resize(h, w int) error { - return term.SetWinsize(t.master.Fd(), &term.Winsize{Height: uint16(h), Width: uint16(w)}) + return SetWinsize(t.master.Fd(), &Winsize{Height: uint16(h), Width: uint16(w)}) } func (t *TtyConsole) attach(command *execdriver.Command, pipes *execdriver.Pipes) error {