diff options
author | gVisor bot <gvisor-bot@google.com> | 2019-06-04 06:19:01 +0000 |
---|---|---|
committer | gVisor bot <gvisor-bot@google.com> | 2019-06-04 06:19:01 +0000 |
commit | 4f56f1bf2248bb17da8b269b4191218d85ce6587 (patch) | |
tree | 00e4c90f29024c89477bc7cee708f8020ff4a49a /runsc/sandbox/sandbox.go | |
parent | fcaa9421355cf770cf47c792388e25700b802e05 (diff) | |
parent | f520d0d585e159da902b2880c5e115abeaacf9cb (diff) |
Merge f520d0d5 (automated)
Diffstat (limited to 'runsc/sandbox/sandbox.go')
-rw-r--r-- | runsc/sandbox/sandbox.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/runsc/sandbox/sandbox.go b/runsc/sandbox/sandbox.go index 47a66afb2..032190636 100644 --- a/runsc/sandbox/sandbox.go +++ b/runsc/sandbox/sandbox.go @@ -649,7 +649,7 @@ func (s *Sandbox) Wait(cid string) (syscall.WaitStatus, error) { // WaitPID waits for process 'pid' in the container's sandbox and returns its // WaitStatus. -func (s *Sandbox) WaitPID(cid string, pid int32, clearStatus bool) (syscall.WaitStatus, error) { +func (s *Sandbox) WaitPID(cid string, pid int32) (syscall.WaitStatus, error) { log.Debugf("Waiting for PID %d in sandbox %q", pid, s.ID) var ws syscall.WaitStatus conn, err := s.sandboxConnect() @@ -659,9 +659,8 @@ func (s *Sandbox) WaitPID(cid string, pid int32, clearStatus bool) (syscall.Wait defer conn.Close() args := &boot.WaitPIDArgs{ - PID: pid, - CID: cid, - ClearStatus: clearStatus, + PID: pid, + CID: cid, } if err := conn.Call(boot.ContainerWaitPID, args, &ws); err != nil { return ws, fmt.Errorf("waiting on PID %d in sandbox %q: %v", pid, s.ID, err) |