diff options
| author | Peter Hunt <pehunt@redhat.com> | 2019-11-15 12:44:15 -0500 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-12-10 10:46:57 -0500 |
| commit | cc95786d06e2b9fa1c0bd93f23d65953cc7a57c8 (patch) | |
| tree | fae7aeb9fa615eac9536c6040283d3f65985ca8e /libpod/container_internal.go | |
| parent | a05ee7e7e38accc86d3105742de91f0e29b4480d (diff) | |
| download | podman-cc95786d06e2b9fa1c0bd93f23d65953cc7a57c8.tar.gz podman-cc95786d06e2b9fa1c0bd93f23d65953cc7a57c8.tar.bz2 podman-cc95786d06e2b9fa1c0bd93f23d65953cc7a57c8.zip | |
Also delete winsz fifo
In conmon 2.0.3, we add another fifo to handle window resizing. This needs to be cleaned up for commands like restore, where the same path is used.
Signed-off-by: Peter Hunt <pehunt@redhat.com>
Diffstat (limited to 'libpod/container_internal.go')
| -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 c0a6960cd..75bd90f36 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()) |