diff options
author | Nicolas Lacasse <nlacasse@google.com> | 2019-06-25 11:46:19 -0700 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2019-06-25 11:47:27 -0700 |
commit | a8f148b8e4098eaeb80e1d704b64aab8aeb1294f (patch) | |
tree | 84e3b913a2c2be598eb89d1a666bacb83abbca11 /runsc/console/ctty_1_13.go | |
parent | 03ae91c662869a37ba71dd2577d4e218a3aa4669 (diff) |
Use different Ctty FDs based on the go version.
An upcoming change in Go 1.13 [1] changes the semantics of the SysProcAttr.Ctty
field. Prior to the change, the FD must be an FD in the child process's FD
table (aka "post-shuffle"). After the change, the FD must be an FD in the
current process's FD table (aka "pre-shuffle").
To be compatible with both versions this CL introduces a new boolean
"CttyFdIsPostShuffle" which indicates whether a pre- or post-shuffle FD should
be provided. We use build tags to chose the correct one.
1: https://go-review.googlesource.com/c/go/+/178919/
PiperOrigin-RevId: 255015303
Diffstat (limited to 'runsc/console/ctty_1_13.go')
-rw-r--r-- | runsc/console/ctty_1_13.go | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/runsc/console/ctty_1_13.go b/runsc/console/ctty_1_13.go new file mode 100644 index 000000000..785d720e1 --- /dev/null +++ b/runsc/console/ctty_1_13.go @@ -0,0 +1,24 @@ +// Copyright 2019 The gVisor Authors. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// +build go1.13 +// +build !go1.14 + +// TODO(b/133868570): Delete once Go 1.12 is no longer supported. + +package console + +// CttyFdIsPostShuffle indicates that in go1.13 and later, the SysProcAttr.Ctty +// FD is determined "post-shuffle". +var CttyFdIsPostShuffle = true |