diff options
Diffstat (limited to 'libpod/container_internal.go')
| -rw-r--r-- | libpod/container_internal.go | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/libpod/container_internal.go b/libpod/container_internal.go index a79b9e5a8..a5208a0df 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -12,14 +12,14 @@ import ( "strings" "time" - "github.com/containers/libpod/v2/libpod/define" - "github.com/containers/libpod/v2/libpod/events" - "github.com/containers/libpod/v2/pkg/cgroups" - "github.com/containers/libpod/v2/pkg/ctime" - "github.com/containers/libpod/v2/pkg/hooks" - "github.com/containers/libpod/v2/pkg/hooks/exec" - "github.com/containers/libpod/v2/pkg/rootless" - "github.com/containers/libpod/v2/pkg/selinux" + "github.com/containers/podman/v2/libpod/define" + "github.com/containers/podman/v2/libpod/events" + "github.com/containers/podman/v2/pkg/cgroups" + "github.com/containers/podman/v2/pkg/ctime" + "github.com/containers/podman/v2/pkg/hooks" + "github.com/containers/podman/v2/pkg/hooks/exec" + "github.com/containers/podman/v2/pkg/rootless" + "github.com/containers/podman/v2/pkg/selinux" "github.com/containers/storage" "github.com/containers/storage/pkg/archive" "github.com/containers/storage/pkg/idtools" @@ -1557,7 +1557,7 @@ func (c *Container) chownVolume(volumeName string) error { if err != nil { return err } - if err := os.Chown(path, uid, gid); err != nil { + if err := os.Lchown(path, uid, gid); err != nil { return err } return nil @@ -1588,6 +1588,12 @@ func (c *Container) cleanupStorage() error { } } + if err := c.cleanupOverlayMounts(); err != nil { + // If the container can't remove content report the error + logrus.Errorf("Failed to cleanup overlay mounts for %s: %v", c.ID(), err) + cleanupErr = err + } + if c.config.Rootfs != "" { return cleanupErr } |