diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-07-02 20:16:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-02 20:16:03 -0400 |
| commit | 878a2231f9eae037d15bc27c50cdf3a9418793c7 (patch) | |
| tree | 8611adc09be6ba26b9a5388e9e576a6b4dbdfc44 /libpod/networking_slirp4netns.go | |
| parent | fc2f9cc3e6f923fcb09b83414e222574228ec94e (diff) | |
| parent | ed51e3f54898128e68330de395736c80868100e8 (diff) | |
| download | podman-878a2231f9eae037d15bc27c50cdf3a9418793c7.tar.gz podman-878a2231f9eae037d15bc27c50cdf3a9418793c7.tar.bz2 podman-878a2231f9eae037d15bc27c50cdf3a9418793c7.zip | |
Merge pull request #10851 from Luap99/service-reaper
podman service reaper
Diffstat (limited to 'libpod/networking_slirp4netns.go')
| -rw-r--r-- | libpod/networking_slirp4netns.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libpod/networking_slirp4netns.go b/libpod/networking_slirp4netns.go index 74d390d29..410b377ec 100644 --- a/libpod/networking_slirp4netns.go +++ b/libpod/networking_slirp4netns.go @@ -18,6 +18,7 @@ import ( "github.com/containers/podman/v3/pkg/errorhandling" "github.com/containers/podman/v3/pkg/rootlessport" + "github.com/containers/podman/v3/pkg/servicereaper" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) @@ -299,6 +300,7 @@ func (r *Runtime) setupSlirp4netns(ctr *Container) error { return errors.Wrapf(err, "failed to start slirp4netns process") } defer func() { + servicereaper.AddPID(cmd.Process.Pid) if err := cmd.Process.Release(); err != nil { logrus.Errorf("unable to release command process: %q", err) } @@ -514,6 +516,7 @@ outer: return errors.Wrapf(err, "failed to start rootlessport process") } defer func() { + servicereaper.AddPID(cmd.Process.Pid) if err := cmd.Process.Release(); err != nil { logrus.Errorf("unable to release rootlessport process: %q", err) } |