浏览代码

Merge pull request #14842 from hqhq/hq_remove_rootuid

Remove unused parameter in NewTtyConsole
Alexander Morozov 10 年之前
父节点
当前提交
30b951ff08
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      daemon/execdriver/native/driver.go

+ 2 - 2
daemon/execdriver/native/driver.go

@@ -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