docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14842 from hqhq/hq_remove_rootuid 

Remove unused parameter in NewTtyConsole
This commit is contained in:
Alexander Morozov 2015-07-21 21:37:21 -07:00
parent ff011ededb af3059855c
commit 30b951ff08
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/execdriver/native/driver.go
View File

@ -361,7 +361,7 @@ type TtyConsole struct {
console libcontainer.Console console libcontainer.Console
} }
func NewTtyConsole(console libcontainer.Console, pipes *execdriver.Pipes, rootuid int) (*TtyConsole, error) { func NewTtyConsole(console libcontainer.Console, pipes *execdriver.Pipes) (*TtyConsole, error) {
tty := &TtyConsole{ tty := &TtyConsole{
console: console, console: console,
} }
@ -417,7 +417,7 @@ func setupPipes(container *configs.Config, processConfig *execdriver.ProcessConf
if err != nil { if err != nil {
return err return err
} }
term, err = NewTtyConsole(cons, pipes, rootuid) term, err = NewTtyConsole(cons, pipes)
} else { } else {
p.Stdout = pipes.Stdout p.Stdout = pipes.Stdout
p.Stderr = pipes.Stderr p.Stderr = pipes.Stderr