diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-11-04 17:06:52 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-11-04 17:06:52 +0100 |
| commit | 31a58278569ca797946b88d5d672f2ad21609597 (patch) | |
| tree | 25148d414ebedad8d8375e2f78240132ca8e82e3 /libpod | |
| parent | 381fa4df875af3d2acee34d4fc1a608b2218b551 (diff) | |
| download | podman-31a58278569ca797946b88d5d672f2ad21609597.tar.gz podman-31a58278569ca797946b88d5d672f2ad21609597.tar.bz2 podman-31a58278569ca797946b88d5d672f2ad21609597.zip | |
slirp4netns: fix timeout
the pidWaitTimeout is already a Duration so do not multiply it again
by time.Millisecond.
Closes: https://github.com/containers/libpod/issues/4344
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'libpod')
| -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 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) } |