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/cmd/exec.go | |
parent | 302245568e5f5286ac6cce38991ea3b9a17a64b7 (diff) | |
parent | 2eaf54dd597d8aaa56ad6274e0c1e585d9b9c063 (diff) |
Merge release-20200818.0-102-g2eaf54dd5 (automated)
Diffstat (limited to 'runsc/cmd/exec.go')
-rw-r--r-- | runsc/cmd/exec.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runsc/cmd/exec.go b/runsc/cmd/exec.go index 600876a27..775ed4b43 100644 --- a/runsc/cmd/exec.go +++ b/runsc/cmd/exec.go @@ -220,7 +220,7 @@ func (ex *Exec) execChildAndWait(waitStatus *syscall.WaitStatus) subcommands.Exi cmd.Stderr = os.Stderr // 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 ex.consoleSocket != "" { // Create a new TTY pair and send the master on the provided socket. tty, err := console.NewWithSocket(ex.consoleSocket) @@ -229,7 +229,7 @@ func (ex *Exec) execChildAndWait(waitStatus *syscall.WaitStatus) subcommands.Exi } defer tty.Close() - // Set stdio to the new TTY slave. + // Set stdio to the new TTY replica. cmd.Stdin = tty cmd.Stdout = tty cmd.Stderr = tty |