mirror of
https://github.com/opencontainers/runc.git
synced 2026-07-11 06:03:57 +08:00
tty: ClosePostStart: rm return value
It is not and was not ever used. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
@@ -159,11 +159,10 @@ func (t *tty) waitConsole() error {
|
|||||||
|
|
||||||
// ClosePostStart closes any fds that are provided to the container and dup2'd
|
// ClosePostStart closes any fds that are provided to the container and dup2'd
|
||||||
// so that we no longer have copy in our process.
|
// so that we no longer have copy in our process.
|
||||||
func (t *tty) ClosePostStart() error {
|
func (t *tty) ClosePostStart() {
|
||||||
for _, c := range t.postStart {
|
for _, c := range t.postStart {
|
||||||
_ = c.Close()
|
_ = c.Close()
|
||||||
}
|
}
|
||||||
return nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Close closes all open fds for the tty and/or restores the original
|
// Close closes all open fds for the tty and/or restores the original
|
||||||
|
|||||||
+1
-4
@@ -301,10 +301,7 @@ func (r *runner) run(config *specs.Process) (int, error) {
|
|||||||
r.terminate(process)
|
r.terminate(process)
|
||||||
return -1, err
|
return -1, err
|
||||||
}
|
}
|
||||||
if err = tty.ClosePostStart(); err != nil {
|
tty.ClosePostStart()
|
||||||
r.terminate(process)
|
|
||||||
return -1, err
|
|
||||||
}
|
|
||||||
if r.pidFile != "" {
|
if r.pidFile != "" {
|
||||||
if err = createPidFile(r.pidFile, process); err != nil {
|
if err = createPidFile(r.pidFile, process); err != nil {
|
||||||
r.terminate(process)
|
r.terminate(process)
|
||||||
|
|||||||
Reference in New Issue
Block a user