diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-04-01 11:23:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-01 11:23:30 -0400 |
| commit | 35348a3e87c23223b6f0aa94127d3f35a95eb676 (patch) | |
| tree | 6442be44b0dfbcc2412efb961f87de82497f59fe /libpod/networking_linux.go | |
| parent | 0a839a59ec43ae03c522a1b82224605219256ab1 (diff) | |
| parent | d30a1e9d087db9efd287e707eb41b88bfafad822 (diff) | |
| download | podman-35348a3e87c23223b6f0aa94127d3f35a95eb676.tar.gz podman-35348a3e87c23223b6f0aa94127d3f35a95eb676.tar.bz2 podman-35348a3e87c23223b6f0aa94127d3f35a95eb676.zip | |
Merge pull request #13721 from mheon/bump_403
Backports and release notes for v4.0.3
Diffstat (limited to 'libpod/networking_linux.go')
| -rw-r--r-- | libpod/networking_linux.go | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index 29b9941fe..eb264379f 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -496,10 +496,13 @@ func (r *Runtime) GetRootlessNetNs(new bool) (*RootlessNetNS, error) { return nil, err } - // move to systemd scope to prevent systemd from killing it - err = utils.MoveRootlessNetnsSlirpProcessToUserSlice(cmd.Process.Pid) - if err != nil { - logrus.Errorf("failed to move the rootless netns slirp4netns process to the systemd user.slice: %v", err) + if utils.RunsOnSystemd() { + // move to systemd scope to prevent systemd from killing it + err = utils.MoveRootlessNetnsSlirpProcessToUserSlice(cmd.Process.Pid) + if err != nil { + // only log this, it is not fatal but can lead to issues when running podman inside systemd units + logrus.Errorf("failed to move the rootless netns slirp4netns process to the systemd user.slice: %v", err) + } } // build a new resolv.conf file which uses the slirp4netns dns server address |