diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-09-01 21:46:57 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-09-01 21:46:57 +0000 |
| commit | dbd886176ac62b526c81fcda13da63c74d46be98 (patch) | |
| tree | 95829e05bd49451d8993a7cfcbc07465a13164d2 /runsc/sandbox | |
| parent | 302245568e5f5286ac6cce38991ea3b9a17a64b7 (diff) | |
| parent | 2eaf54dd597d8aaa56ad6274e0c1e585d9b9c063 (diff) | |
Merge release-20200818.0-102-g2eaf54dd5 (automated)
Diffstat (limited to 'runsc/sandbox')
| -rw-r--r-- | runsc/sandbox/sandbox.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runsc/sandbox/sandbox.go b/runsc/sandbox/sandbox.go index a339937fb..a8f4f64a5 100644 --- a/runsc/sandbox/sandbox.go +++ b/runsc/sandbox/sandbox.go @@ -478,10 +478,10 @@ func (s *Sandbox) createSandboxProcess(conf *config.Config, args *Args, startSyn cmd.Stderr = nil // If the console control socket file is provided, then create a new - // pty master/slave pair and set the TTY on the sandbox process. + // pty master/replica pair and set the TTY on the sandbox process. if args.Spec.Process.Terminal && args.ConsoleSocket != "" { // console.NewWithSocket will send the master on the given - // socket, and return the slave. + // socket, and return the replica. tty, err := console.NewWithSocket(args.ConsoleSocket) if err != nil { return fmt.Errorf("setting up console with socket %q: %v", args.ConsoleSocket, err) |