opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-04 01:48:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

libpod: rename function

Browse Source 
the function checks if a path is under any mount, not just bind
mounts.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2022-09-14 13:03:56 +02:00
parent 017d81ddd0
commit 92dc61d5ed
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/container_internal_common.go
View File

@ -531,7 +531,7 @@ func (c *Container) isWorkDirSymlink(resolvedPath string) bool {
} }
if resolvedSymlink != "" { if resolvedSymlink != "" {
_, resolvedSymlinkWorkdir, err := c.resolvePath(c.state.Mountpoint, resolvedSymlink) _, resolvedSymlinkWorkdir, err := c.resolvePath(c.state.Mountpoint, resolvedSymlink)
if isPathOnVolume(c, resolvedSymlinkWorkdir) || isPathOnBindMount(c, resolvedSymlinkWorkdir) { if isPathOnVolume(c, resolvedSymlinkWorkdir) || isPathOnMount(c, resolvedSymlinkWorkdir) {
// Resolved symlink exists on external volume or mount // Resolved symlink exists on external volume or mount
return true return true
} }
@ -564,7 +564,7 @@ func (c *Container) resolveWorkDir() error {
// If the specified workdir is a subdir of a volume or mount, // If the specified workdir is a subdir of a volume or mount,
// we don't need to do anything. The runtime is taking care of // we don't need to do anything. The runtime is taking care of
// that. // that.
if isPathOnVolume(c, workdir) || isPathOnBindMount(c, workdir) { if isPathOnVolume(c, workdir) || isPathOnMount(c, workdir) {
logrus.Debugf("Workdir %q resolved to a volume or mount", workdir) logrus.Debugf("Workdir %q resolved to a volume or mount", workdir)
return nil return nil
} }

4
libpod/container_path_resolution.go
View File

@ -152,9 +152,9 @@ func findBindMount(c *Container, containerPath string) *specs.Mount {
return nil return nil
} }
/// isPathOnBindMount returns true if the specified containerPath is a subdir of any /// isPathOnMount returns true if the specified containerPath is a subdir of any
// Mount's destination. // Mount's destination.
func isPathOnBindMount(c *Container, containerPath string) bool { func isPathOnMount(c *Container, containerPath string) bool {
cleanedContainerPath := filepath.Clean(containerPath) cleanedContainerPath := filepath.Clean(containerPath)
for _, m := range c.config.Spec.Mounts { for _, m := range c.config.Spec.Mounts {
if cleanedContainerPath == filepath.Clean(m.Destination) { if cleanedContainerPath == filepath.Clean(m.Destination) {