diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-03 16:37:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-03 16:37:54 -0400 |
| commit | 3210a3f4257d19744abd4ae2302018b16edb2507 (patch) | |
| tree | 97f6f9e2c4bfd41191971c5658484012ce1b4826 /libpod/networking_linux.go | |
| parent | 3af1396f269463aa7640e9cf1dcc84a413d99ee0 (diff) | |
| parent | 3ab8fa679c57a653f7ea012f79fa453ae8133108 (diff) | |
| download | podman-3210a3f4257d19744abd4ae2302018b16edb2507.tar.gz podman-3210a3f4257d19744abd4ae2302018b16edb2507.tar.bz2 podman-3210a3f4257d19744abd4ae2302018b16edb2507.zip | |
Merge pull request #14100 from mheon/incremental_backports
[v4.1] Incremental backports
Diffstat (limited to 'libpod/networking_linux.go')
| -rw-r--r-- | libpod/networking_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index 2770b040e..0c124cf0b 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -488,7 +488,7 @@ func (r *Runtime) GetRootlessNetNs(new bool) (*RootlessNetNS, error) { pid := strconv.Itoa(cmd.Process.Pid) err = ioutil.WriteFile(filepath.Join(rootlessNetNsDir, rootlessNetNsSilrp4netnsPidFile), []byte(pid), 0700) if err != nil { - errors.Wrap(err, "unable to write rootless-netns slirp4netns pid file") + return nil, errors.Wrap(err, "unable to write rootless-netns slirp4netns pid file") } defer func() { |