Merge pull request opencontainers#550 from rajasec/restoretty

crosbymichael · crosbymichael · commit 361f9b792166 · 2016-02-11T10:27:58.000-08:00
Adding tty closure for restore operation
diff --git a/restore.go b/restore.go
@@ -135,12 +135,14 @@ func restoreContainer(context *cli.Context, spec *specs.LinuxSpec, config *confi
 		return -1, err
 	}
 	if err := container.Restore(process, options); err != nil {
+		tty.Close()
 		return -1, err
 	}
 	if pidFile := context.String("pid-file"); pidFile != "" {
 		if err := createPidFile(pidFile, process); err != nil {
 			process.Signal(syscall.SIGKILL)
 			process.Wait()
+			tty.Close()
 			return -1, err
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -135,12 +135,14 @@ func restoreContainer(context cli.Context, spec specs.LinuxSpec, config *confi`
`135`	`135`	`return -1, err`
`136`	`136`	`}`
`137`	`137`	`if err := container.Restore(process, options); err != nil {`
	`138`	`+ tty.Close()`
`138`	`139`	`return -1, err`
`139`	`140`	`}`
`140`	`141`	`if pidFile := context.String("pid-file"); pidFile != "" {`
`141`	`142`	`if err := createPidFile(pidFile, process); err != nil {`
`142`	`143`	`process.Signal(syscall.SIGKILL)`
`143`	`144`	`process.Wait()`
	`145`	`+ tty.Close()`
`144`	`146`	`return -1, err`
`145`	`147`	`}`
`146`	`148`	`}`