summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-11-05 08:55:01 +0100
committerGitHub <noreply@github.com>2019-11-05 08:55:01 +0100
commit1db4556d424d6fac5d12940f0b0cc66f7e00aa67 (patch)
treec582331766702bad54e055888dd9a405c3af7751
parent17eadda68b868ab1dc8c455f4f537b78ad3962a5 (diff)
parent31a58278569ca797946b88d5d672f2ad21609597 (diff)
downloadpodman-1db4556d424d6fac5d12940f0b0cc66f7e00aa67.tar.gz
podman-1db4556d424d6fac5d12940f0b0cc66f7e00aa67.tar.bz2
podman-1db4556d424d6fac5d12940f0b0cc66f7e00aa67.zip
Merge pull request #4438 from giuseppe/fix-slirp4netns-timeout
slirp4netns: fix timeout
-rw-r--r--libpod/networking_linux.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go
index daa0619a2..ac1144fbe 100644
--- a/libpod/networking_linux.go
+++ b/libpod/networking_linux.go
@@ -295,7 +295,7 @@ func (r *Runtime) setupRootlessNetNS(ctr *Container) (err error) {
defer close(chWait)
// wait that API socket file appears before trying to use it.
- if _, err := WaitForFile(apiSocket, chWait, pidWaitTimeout*time.Millisecond); err != nil {
+ if _, err := WaitForFile(apiSocket, chWait, pidWaitTimeout); err != nil {
return errors.Wrapf(err, "waiting for slirp4nets to create the api socket file %s", apiSocket)
}