Merge 67e2f227 (automated)

1 files changed, 5 insertions, 11 deletions

diff --git a/runsc/cmd/exec.go b/runsc/cmd/exec.go
index 5a823e89a..e817eff77 100644
--- a/runsc/cmd/exec.go
+++ b/runsc/cmd/exec.go
@@ -235,18 +235,12 @@ func (ex *Exec) execChildAndWait(waitStatus *syscall.WaitStatus) subcommands.Exi
 		cmd.SysProcAttr = &syscall.SysProcAttr{
 			Setsid:  true,
 			Setctty: true,
-			Ctty:    int(tty.Fd()),
+			// The Ctty FD must be the FD in the child process's FD
+			// table. Since we set cmd.Stdin/Stdout/Stderr to the
+			// tty FD, we can use any of 0, 1, or 2 here.
+			// See https://github.com/golang/go/issues/29458.
+			Ctty: 0,
 		}
-		// TODO(b/133868570): Delete this check once Go 1.12 is no
-		// longer supported.
-		if console.CttyFdIsPostShuffle {
-			// In go1.12 and before, the Ctty FD must be the FD in
-			// the child process's FD table. Since we set
-			// cmd.Stdin/Stdout/Stderr to the tty FD, we can use
-			// any of 0, 1, or 2 here.
-			cmd.SysProcAttr.Ctty = 0
-		}
-
 	}
 
 	if err := cmd.Start(); err != nil {