From 1fadb5e5738ca681ee6c4115e8f2c99eb9ecb808 Mon Sep 17 00:00:00 2001
From: Lantao Liu <lantaol@google.com>
Date: Tue, 12 Sep 2017 07:10:55 +0000
Subject: [PATCH] Follow symlink for mount host path.

Signed-off-by: Lantao Liu <lantaol@google.com>
---
 pkg/server/container_create.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkg/server/container_create.go b/pkg/server/container_create.go
index d76644df8..2c4914ebd 100644
--- a/pkg/server/container_create.go
+++ b/pkg/server/container_create.go
@@ -495,6 +495,12 @@ func addOCIBindMounts(g *generate.Generator, mounts []*runtime.Mount, mountLabel
 				return fmt.Errorf("failed to mkdir %q: %v", src, err)
 			}
 		}
+		// TODO(random-liu): Add cri-containerd integration test or cri validation test
+		// for this.
+		src, err := resolveSymbolicLink(src)
+		if err != nil {
+			return fmt.Errorf("failed to resolve symlink %q: %v", src, err)
+		}
 		options := []string{"rbind"}
 		switch mount.GetPropagation() {
 		case runtime.MountPropagation_PROPAGATION_PRIVATE: