diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-03-07 06:11:49 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-03-07 06:11:49 +0000 |
| commit | 05c2d6c038777818932d3991c0de9cfa2a7bea51 (patch) | |
| tree | 2a394d8666124ff8188b0c945854e2b7e3281217 /runsc/cmd/wait.go | |
| parent | 2fa12b2aa91ba00211df440f5e6a64e45a2ecb91 (diff) | |
| parent | e668288fafe378ab4dc7fbb23ac933a15a2fff94 (diff) | |
Merge release-20210301.0-22-ge668288fa (automated)
Diffstat (limited to 'runsc/cmd/wait.go')
| -rw-r--r-- | runsc/cmd/wait.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runsc/cmd/wait.go b/runsc/cmd/wait.go index 5d55422c7..d7a783b88 100644 --- a/runsc/cmd/wait.go +++ b/runsc/cmd/wait.go @@ -18,9 +18,9 @@ import ( "context" "encoding/json" "os" - "syscall" "github.com/google/subcommands" + "golang.org/x/sys/unix" "gvisor.dev/gvisor/runsc/config" "gvisor.dev/gvisor/runsc/container" "gvisor.dev/gvisor/runsc/flag" @@ -77,7 +77,7 @@ func (wt *Wait) Execute(_ context.Context, f *flag.FlagSet, args ...interface{}) Fatalf("loading container: %v", err) } - var waitStatus syscall.WaitStatus + var waitStatus unix.WaitStatus switch { // Wait on the whole container. case wt.rootPID == unsetPID && wt.pid == unsetPID: @@ -119,7 +119,7 @@ type waitResult struct { // exitStatus returns the correct exit status for a process based on if it // was signaled or exited cleanly. -func exitStatus(status syscall.WaitStatus) int { +func exitStatus(status unix.WaitStatus) int { if status.Signaled() { return 128 + int(status.Signal()) } |