diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-16 04:21:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-16 04:21:32 -0700 |
| commit | 97fb49571828b9d206ff284ed18448f96ae877e9 (patch) | |
| tree | b1b5c7ecb963a4bc012bf0f65c287862644938b3 /libpod/networking_linux.go | |
| parent | 3384bd87c85950c245524682efa2a0f124097122 (diff) | |
| parent | a0c35c394bb95d15aeed8fcc467cb110f67fa6db (diff) | |
| download | podman-97fb49571828b9d206ff284ed18448f96ae877e9.tar.gz podman-97fb49571828b9d206ff284ed18448f96ae877e9.tar.bz2 podman-97fb49571828b9d206ff284ed18448f96ae877e9.zip | |
Merge pull request #2620 from baude/multilogs
display logs for multiple containers at the same time
Diffstat (limited to 'libpod/networking_linux.go')
| -rw-r--r-- | libpod/networking_linux.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index d8b0cffcb..2450bd6b1 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -215,9 +215,12 @@ func (r *Runtime) setupRootlessNetNS(ctr *Container) (err error) { if pid != cmd.Process.Pid { continue } - if status.Exited() || status.Signaled() { + if status.Exited() { return errors.New("slirp4netns failed") } + if status.Signaled() { + return errors.New("slirp4netns killed by signal") + } continue } return errors.Wrapf(err, "failed to read from slirp4netns sync pipe") |