|
@@ -4,7 +4,6 @@ import (
|
|
"fmt"
|
|
"fmt"
|
|
"github.com/dotcloud/docker/execdriver"
|
|
"github.com/dotcloud/docker/execdriver"
|
|
"github.com/dotcloud/docker/pkg/cgroups"
|
|
"github.com/dotcloud/docker/pkg/cgroups"
|
|
- "github.com/dotcloud/docker/pkg/term"
|
|
|
|
"github.com/dotcloud/docker/utils"
|
|
"github.com/dotcloud/docker/utils"
|
|
"io/ioutil"
|
|
"io/ioutil"
|
|
"log"
|
|
"log"
|
|
@@ -78,7 +77,7 @@ func (d *driver) Name() string {
|
|
}
|
|
}
|
|
|
|
|
|
func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallback execdriver.StartCallback) (int, error) {
|
|
func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallback execdriver.StartCallback) (int, error) {
|
|
- if err := term.SetTerminal(c, pipes); err != nil {
|
|
|
|
|
|
+ if err := execdriver.SetTerminal(c, pipes); err != nil {
|
|
return -1, err
|
|
return -1, err
|
|
}
|
|
}
|
|
configPath, err := d.generateLXCConfig(c)
|
|
configPath, err := d.generateLXCConfig(c)
|