mirror of
https://github.com/containers/podman.git
synced 2025-07-02 08:47:43 +08:00
libpod: rename function
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:
@ -531,7 +531,7 @@ func (c *Container) isWorkDirSymlink(resolvedPath string) bool {
|
||||
}
|
||||
if 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
|
||||
return true
|
||||
}
|
||||
@ -564,7 +564,7 @@ func (c *Container) resolveWorkDir() error {
|
||||
// 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
|
||||
// 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)
|
||||
return nil
|
||||
}
|
||||
|
@ -152,9 +152,9 @@ func findBindMount(c *Container, containerPath string) *specs.Mount {
|
||||
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.
|
||||
func isPathOnBindMount(c *Container, containerPath string) bool {
|
||||
func isPathOnMount(c *Container, containerPath string) bool {
|
||||
cleanedContainerPath := filepath.Clean(containerPath)
|
||||
for _, m := range c.config.Spec.Mounts {
|
||||
if cleanedContainerPath == filepath.Clean(m.Destination) {
|
||||
|
Reference in New Issue
Block a user