summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorPeter Hunt <pehunt@redhat.com>2019-11-15 12:44:15 -0500
committerPeter Hunt <pehunt@redhat.com>2019-11-15 12:44:15 -0500
commitfa415f07a106c5be18d1d44e23da9c01af906474 (patch)
treea447e7d9e88c1a056d7d294a91c7be4486084bd1 /libpod
parentd7ed9fa188b502e155ddbf6b626cf8fbfc92bbb8 (diff)
downloadpodman-fa415f07a106c5be18d1d44e23da9c01af906474.tar.gz
podman-fa415f07a106c5be18d1d44e23da9c01af906474.tar.bz2
podman-fa415f07a106c5be18d1d44e23da9c01af906474.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')
-rw-r--r--libpod/container_internal.go5
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())