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

Merge pull request #4598 from creack/fix_lxc 

Fix lxc
This commit is contained in:
Victor Vieux 2014-03-11 17:17:54 -07:00
parent 7b79f597f6 fd0737df2c
commit f9fde52a07
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
execdriver/lxc/driver.go
View File

@ -168,6 +168,9 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
// Poll lxc for RUNNING status // Poll lxc for RUNNING status
pid, err := d.waitForStart(c, waitLock) pid, err := d.waitForStart(c, waitLock)
if err != nil { if err != nil {
if c.Process != nil {
c.Process.Kill()
}
return -1, err return -1, err
} }
c.ContainerPid = pid c.ContainerPid = pid

2
execdriver/lxc/info.go
View File

@ -36,7 +36,7 @@ func parseLxcInfo(raw string) (*lxcInfo, error) {
if len(parts) < 2 { if len(parts) < 2 {
continue continue
} }
switch strings.TrimSpace(parts[0]) { switch strings.ToLower(strings.TrimSpace(parts[0])) {
case "state": case "state":
info.Running = strings.TrimSpace(parts[1]) == "RUNNING" info.Running = strings.TrimSpace(parts[1]) == "RUNNING"
case "pid": case "pid":

6
server.go
View File

@ -2384,7 +2384,13 @@ func (srv *Server) IsRunning() bool {
} }
func (srv *Server) Close() error { func (srv *Server) Close() error {
if srv == nil {
return nil
}
srv.SetRunning(false) srv.SetRunning(false)
if srv.runtime == nil {
return nil
}
return srv.runtime.Close() return srv.runtime.Close()
} }