@@ -10,7 +10,7 @@ import (

 	"github.com/dotcloud/docker/archive"

 	"github.com/dotcloud/docker/daemon/execdriver"

-	"github.com/dotcloud/docker/utils"

+	"github.com/dotcloud/docker/pkg/symlink"

 )

 type BindMap struct {

@@ -213,7 +213,7 @@ func createVolumes(container *Container) error {

 		}

 		// Create the mountpoint

-		rootVolPath, err := utils.FollowSymlinkInScope(filepath.Join(container.basefs, volPath), container.basefs)

+		rootVolPath, err := symlink.FollowSymlinkInScope(filepath.Join(container.basefs, volPath), container.basefs)

 		if err != nil {

 			return err

 		}

@@ -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

 		}

@@ -20,6 +20,7 @@ import (

 	"github.com/dotcloud/docker/archive"

 	"github.com/dotcloud/docker/daemon"

 	"github.com/dotcloud/docker/nat"

+	"github.com/dotcloud/docker/pkg/symlink"

 	"github.com/dotcloud/docker/registry"

 	"github.com/dotcloud/docker/runconfig"

 	"github.com/dotcloud/docker/utils"

@@ -404,7 +405,7 @@ func (b *buildFile) addContext(container *daemon.Container, orig, dest string, r

 	)

 	if destPath != container.RootfsPath() {

-		destPath, err = utils.FollowSymlinkInScope(destPath, container.RootfsPath())

+		destPath, err = symlink.FollowSymlinkInScope(destPath, container.RootfsPath())

 		if err != nil {

 			return err

 		}