@@ -945,4 +945,18 @@ func TestModeHostname(t *testing.T) {

 	deleteAllContainers()

 	logDone("run - hostname and several network modes")

-}

\ No newline at end of file

+}

+

+func TestRootWorkdir(t *testing.T) {

+	s, _, err := cmd(t, "run", "--workdir", "/", "busybox", "pwd")

+	if err != nil {

+		t.Fatal(s, err)

+	}

+	if s != "/\n" {

+		t.Fatalf("pwd returned '%s' (expected /\\n)", s)

+	}

+

+	deleteAllContainers()

+

+	logDone("run - workdir /")

+}

@@ -27,13 +27,12 @@ func FollowSymlinkInScope(link, root string) (string, error) {

 		return root, nil

 	}

-

 	if !strings.HasPrefix(filepath.Dir(link), root) {

 		return "", fmt.Errorf("%s is not within %s", link, root)

 	}

 	prev := "/"

-	

+

 	for _, p := range strings.Split(link, "/") {

 		prev = filepath.Join(prev, p)

 		prev = filepath.Clean(prev)