mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #558 from rajasec/tty-panic

Browse Source 
panic during start of failed detached container
This commit is contained in:
Michael Crosby
2016-02-16 16:01:08 -08:00
parent 8ce2413986 321b842404
commit ce72f86a2b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
restore.go
+6 -2
View File
@@ -137,14 +137,18 @@ func restoreContainer(context *cli.Context, spec *specs.LinuxSpec, config *confi
handler := newSignalHandler(tty) handler := newSignalHandler(tty)
defer handler.Close() defer handler.Close()
if err := container.Restore(process, options); err != nil { if err := container.Restore(process, options); err != nil {
tty.Close() if tty != nil {
tty.Close()
}
return -1, err return -1, err
} }
if pidFile := context.String("pid-file"); pidFile != "" { if pidFile := context.String("pid-file"); pidFile != "" {
if err := createPidFile(pidFile, process); err != nil { if err := createPidFile(pidFile, process); err != nil {
process.Signal(syscall.SIGKILL) process.Signal(syscall.SIGKILL)
process.Wait() process.Wait()
tty.Close() if tty != nil {
tty.Close()
}
return -1, err return -1, err
} }
} }