浏览代码

Merge pull request #12439 from Mashimiao/add-err-check-before-getting-term

Add error check before getting term
Phil Estes 10 年之前
父节点
当前提交
2c4fe2aba3
共有 1 个文件被更改,包括 7 次插入2 次删除
  1. 7 2
      daemon/execdriver/lxc/driver.go

+ 7 - 2
daemon/execdriver/lxc/driver.go

@@ -85,16 +85,21 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
 		dataPath = d.containerDir(c.ID)
 	)
 
+	container, err := d.createContainer(c)
+	if err != nil {
+		return execdriver.ExitStatus{ExitCode: -1}, err
+	}
+
 	if c.ProcessConfig.Tty {
 		term, err = NewTtyConsole(&c.ProcessConfig, pipes)
 	} else {
 		term, err = execdriver.NewStdConsole(&c.ProcessConfig, pipes)
 	}
-	c.ProcessConfig.Terminal = term
-	container, err := d.createContainer(c)
 	if err != nil {
 		return execdriver.ExitStatus{ExitCode: -1}, err
 	}
+	c.ProcessConfig.Terminal = term
+
 	d.Lock()
 	d.activeContainers[c.ID] = &activeContainer{
 		container: container,