summaryrefslogtreecommitdiffhomepage
path: root/runsc/sandbox/sandbox.go
diff options
context:
space:
mode:
authorgVisor bot <gvisor-bot@google.com>2020-07-14 19:05:02 +0000
committergVisor bot <gvisor-bot@google.com>2020-07-14 19:05:02 +0000
commitbc8cb79b0cd28d1c89673df09324459c529491b5 (patch)
treeb1751f6d6f6b9e7ad7f7bd6c912e5019f6dcf638 /runsc/sandbox/sandbox.go
parentdfde222bdd6a9730fde00796c5d83cf05fcadb45 (diff)
parent1bfb556ccdaee28ffea0cbdc37007edb10fa22c4 (diff)
Merge release-20200622.1-153-g1bfb556cc (automated)
Diffstat (limited to 'runsc/sandbox/sandbox.go')
-rw-r--r--runsc/sandbox/sandbox.go4
1 files changed, 1 insertions, 3 deletions
diff --git a/runsc/sandbox/sandbox.go b/runsc/sandbox/sandbox.go
index 6e1a2af25..2afcc27af 100644
--- a/runsc/sandbox/sandbox.go
+++ b/runsc/sandbox/sandbox.go
@@ -478,9 +478,7 @@ func (s *Sandbox) createSandboxProcess(conf *boot.Config, args *Args, startSyncF
// If the console control socket file is provided, then create a new
// pty master/slave pair and set the TTY on the sandbox process.
- if args.ConsoleSocket != "" {
- cmd.Args = append(cmd.Args, "--console=true")
-
+ if args.Spec.Process.Terminal && args.ConsoleSocket != "" {
// console.NewWithSocket will send the master on the given
// socket, and return the slave.
tty, err := console.NewWithSocket(args.ConsoleSocket)