toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #14842 from hqhq/hq_remove_rootuid

Browse Source 
Remove unused parameter in NewTtyConsole
Upstream-commit: 30b951ff08503bb455ffde8ecd0cfa630bc277ff
Component: engine
This commit is contained in:
Alexander Morozov
2015-07-21 21:37:21 -07:00
parent 9c4a1f92a0 e5400db724
commit dbf636ed08
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -361,7 +361,7 @@ type TtyConsole struct {
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{
console: console,
}
@ -417,7 +417,7 @@ func setupPipes(container *configs.Config, processConfig *execdriver.ProcessConf
if err != nil {
return err
}
term, err = NewTtyConsole(cons, pipes, rootuid)
term, err = NewTtyConsole(cons, pipes)
} else {
p.Stdout = pipes.Stdout
p.Stderr = pipes.Stderr