diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-25 16:19:34 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-25 16:19:34 -0400 |
commit | 3944d8c142c59a293069fda5254e0088662b8d7b (patch) | |
tree | 7929f25201c14a9f4d5a963a905e072f86650633 /libpod/container_internal_linux.go | |
parent | e11feb230923a169c1e235552afa2f7bec7f0fff (diff) | |
parent | 9fcfea7643b243a3ad691daaf07fe358f85491cb (diff) | |
download | podman-3944d8c142c59a293069fda5254e0088662b8d7b.tar.gz podman-3944d8c142c59a293069fda5254e0088662b8d7b.tar.bz2 podman-3944d8c142c59a293069fda5254e0088662b8d7b.zip |
Merge pull request #14329 from mheon/fixmes_1
First batch of resolutions to FIXMEs
Diffstat (limited to 'libpod/container_internal_linux.go')
-rw-r--r-- | libpod/container_internal_linux.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index 298eb1947..e19d75deb 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -1091,7 +1091,6 @@ func (c *Container) addNamespaceContainer(g *generate.Generator, ns LinuxNS, ctr g.AddProcessEnv("HOSTNAME", hostname) } - // TODO need unlocked version of this for use in pods nsPath, err := nsCtr.NamespacePath(ns) if err != nil { return err @@ -3230,10 +3229,8 @@ func (c *Container) fixVolumePermissions(v *ContainerNamedVolume) error { return err } - // TODO: For now, I've disabled chowning volumes owned by non-Podman - // drivers. This may be safe, but it's really going to be a case-by-case - // thing, I think - safest to leave disabled now and re-enable later if - // there is a demand. + // Volumes owned by a volume driver are not chowned - we don't want to + // mess with a mount not managed by us. if vol.state.NeedsChown && !vol.UsesVolumeDriver() { vol.state.NeedsChown = false |