diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2022-02-07 15:04:04 +0100 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2022-02-10 13:59:07 -0500 |
| commit | ed60f8908672a251a6cd366c42152c100dbf68f7 (patch) | |
| tree | 2895fba7d48c1c11419952edbd2e9c631f34645b /libpod | |
| parent | 7e37c608f7ac04ffbb6e11b5b774acfd7afb6d95 (diff) | |
| download | podman-ed60f8908672a251a6cd366c42152c100dbf68f7.tar.gz podman-ed60f8908672a251a6cd366c42152c100dbf68f7.tar.bz2 podman-ed60f8908672a251a6cd366c42152c100dbf68f7.zip | |
move rootless netns slirp4netns process to systemd user.slice
When running podman inside systemd user units, it is possible that
systemd kills the rootless netns slirp4netns process because it was
started in the default unit cgroup. When the unit is stopped all
processes in that cgroup are killed. Since the slirp4netns process is
run once for all containers it should not be killed. To make sure
systemd will not kill the process we move it to the user.slice.
Fixes #13153
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/networking_linux.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index f490ac626..e55e9d114 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -28,6 +28,7 @@ import ( "github.com/containers/podman/v4/pkg/resolvconf" "github.com/containers/podman/v4/pkg/rootless" "github.com/containers/podman/v4/pkg/util" + "github.com/containers/podman/v4/utils" "github.com/containers/storage/pkg/lockfile" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" @@ -495,6 +496,12 @@ 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) + } + // build a new resolv.conf file which uses the slirp4netns dns server address resolveIP, err := GetSlirp4netnsDNS(nil) if err != nil { |