Merge pull request #826 from dotcloud/825-move_xino_shm-fix

- Runtime: fix aufs mount on ubuntu13.04+btrfs
Upstream-commit: 0bc1c6d57a539e9620d3ee8c7f6c5689469a2bdf
Component: engine

components/engine/image.go

@@ -126,6 +126,8 @@ func MountAUFS(ro []string, rw string, target string) error {
 	}
 	branches := fmt.Sprintf("br:%v:%v", rwBranch, roBranches)
 
+	branches += ",xino=/dev/shm/aufs.xino"
+
 	//if error, try to load aufs kernel module
 	if err := mount("none", target, "aufs", 0, branches); err != nil {
 		log.Printf("Kernel does not support AUFS, trying to load the AUFS module with modprobe...")