Merge pull request #21 from ichirin2501/fix-proc-and-symlink

fixed /proc not mounted and recursive symlink

mounter/mount.go

@@ -34,18 +34,18 @@ func ResolveRootDir(dir string) (string, error) {
 	}
 
 	if osutil.IsSymlink(dir) {
-		dir, err = os.Readlink(dir)
+		dir, err = fp.EvalSymlinks(dir)
 		if err != nil {
 			return dir, err
 		}
 	}
 
-	return fp.Clean(dir), nil
+	return dir, nil
 }
 
 func (m *Mounter) MountSysProc() error {
 	// mount -t proc proc {{rootDir}}/proc
-	if err := mount.Mount("proc", fp.Join(m.rootDir, "/proc"), "proc", "remount"); err != nil {
+	if err := osutil.MountIfNotMounted("proc", fp.Join(m.rootDir, "/proc"), "proc", ""); err != nil {
 		return errors.Errorf("Failed to mount /proc: %s", err)
 	}
 	// mount --rbind /sys {{rootDir}}/sys