diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-11-17 17:05:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-17 17:05:07 +0100 |
| commit | db32ed1ae8374aac9c4058607ad9cf294505c952 (patch) | |
| tree | fd8555bebd9e2453bb332b84b9cf3449fc56d2a1 | |
| parent | c6f2383213b6a8ebf4c4b9f5d5162e7c08fa7c9f (diff) | |
| parent | fa415f07a106c5be18d1d44e23da9c01af906474 (diff) | |
| download | podman-db32ed1ae8374aac9c4058607ad9cf294505c952.tar.gz podman-db32ed1ae8374aac9c4058607ad9cf294505c952.tar.bz2 podman-db32ed1ae8374aac9c4058607ad9cf294505c952.zip | |
Merge pull request #4521 from haircommander/winsz-fix
Also delete winsz fifo
| -rw-r--r-- | libpod/container_internal.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 028d7601d..4ff1913b5 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -652,6 +652,11 @@ func (c *Container) removeConmonFiles() error { return errors.Wrapf(err, "error removing container %s ctl file", c.ID()) } + winszFile := filepath.Join(c.bundlePath(), "winsz") + if err := os.Remove(winszFile); err != nil && !os.IsNotExist(err) { + return errors.Wrapf(err, "error removing container %s winsz file", c.ID()) + } + oomFile := filepath.Join(c.bundlePath(), "oom") if err := os.Remove(oomFile); err != nil && !os.IsNotExist(err) { return errors.Wrapf(err, "error removing container %s OOM file", c.ID()) |