From d18af8699c01bf6bb53781b5c4e955320b898e46 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 31 Jul 2017 16:58:04 -0400 Subject: [PATCH] Update for epoll console handling Signed-off-by: Michael Crosby --- linux/shim/exec.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/linux/shim/exec.go b/linux/shim/exec.go index a698b22f1..610f53693 100644 --- a/linux/shim/exec.go +++ b/linux/shim/exec.go @@ -173,8 +173,7 @@ func (e *execProcess) Start(ctx context.Context) (err error) { if err != nil { return errors.Wrap(err, "failed to retrieve console master") } - e.console = console - if err := e.parent.platform.copyConsole(ctx, console, e.stdio.stdin, e.stdio.stdout, e.stdio.stderr, &e.WaitGroup, ©WaitGroup); err != nil { + if e.console, err = e.parent.platform.copyConsole(ctx, console, e.stdio.stdin, e.stdio.stdout, e.stdio.stderr, &e.WaitGroup, ©WaitGroup); err != nil { return errors.Wrap(err, "failed to start console copy") } } else {