erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-08-27 02:37:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #5536 from giuseppe/avoid-conmon-zombie

Browse source 
podman: avoid conmon zombie on exec
This commit is contained in:
OpenShift Merge Robot 2020-03-18 15:10:41 +01:00 • committed by GitHub
commit f08b992f3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libpod/oci_conmon_linux.go
View file

@ -774,6 +774,10 @@ func (r *ConmonOCIRuntime) ExecContainer(c *Container, sessionID string, options
}()
attachToExecCalled = true
if err := execCmd.Wait(); err != nil {
return -1, nil, errors.Wrapf(err, "cannot run conmon")
}
pid, err := readConmonPipeData(parentSyncPipe, ociLog)
return pid, attachChan, err