summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-03-28 15:51:51 +0200
committerGitHub <noreply@github.com>2022-03-28 15:51:51 +0200
commitb76d717bbfc41188d4e03641c33200f2814a0baf (patch)
tree4bbbd797600a5ebd0db7e5b567ffe4f81b80529b
parent54f808e4dd10de0d3ceec7cadac776b119a293b1 (diff)
parent38bd4010cfde804bb07a2eef32d28a332027a173 (diff)
downloadpodman-b76d717bbfc41188d4e03641c33200f2814a0baf.tar.gz
podman-b76d717bbfc41188d4e03641c33200f2814a0baf.tar.bz2
podman-b76d717bbfc41188d4e03641c33200f2814a0baf.zip
Merge pull request #13640 from Luap99/slirp4netns-fail
network setup: fail if slirp4netns is not installed
-rw-r--r--libpod/networking_slirp4netns.go3
1 files changed, 1 insertions, 2 deletions
diff --git a/libpod/networking_slirp4netns.go b/libpod/networking_slirp4netns.go
index b0247dc5c..3f6c4bef2 100644
--- a/libpod/networking_slirp4netns.go
+++ b/libpod/networking_slirp4netns.go
@@ -216,8 +216,7 @@ func (r *Runtime) setupSlirp4netns(ctr *Container, netns ns.NetNS) error {
var err error
path, err = exec.LookPath("slirp4netns")
if err != nil {
- logrus.Errorf("Could not find slirp4netns, the network namespace won't be configured: %v", err)
- return nil
+ return fmt.Errorf("could not find slirp4netns, the network namespace can't be configured: %w", err)
}
}