From f2bd8e8486d6020258884627ad0122384c342342 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Tue, 13 May 2014 10:54:08 -0700 Subject: [PATCH] Update code to handle new path to Follow Symlink func Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) --- libcontainer/mount/init.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libcontainer/mount/init.go b/libcontainer/mount/init.go index 16fb758..e5f2b43 100644 --- a/libcontainer/mount/init.go +++ b/libcontainer/mount/init.go @@ -11,8 +11,8 @@ import ( "github.com/dotcloud/docker/pkg/label" "github.com/dotcloud/docker/pkg/libcontainer" "github.com/dotcloud/docker/pkg/libcontainer/mount/nodes" + "github.com/dotcloud/docker/pkg/symlink" "github.com/dotcloud/docker/pkg/system" - "github.com/dotcloud/docker/utils" ) // default mount point flags @@ -129,7 +129,7 @@ func setupBindmounts(rootfs string, bindMounts libcontainer.Mounts) error { return err } - dest, err = utils.FollowSymlinkInScope(dest, rootfs) + dest, err = symlink.FollowSymlinkInScope(dest, rootfs) if err != nil { return err }