From 33373ef8996c09b3cc612551f6c6b4f7acd31ae2 Mon Sep 17 00:00:00 2001
From: David Rochberg <rochberg@chromium.org>
Date: Wed, 16 Feb 2011 14:48:27 -0500
Subject: [PATCH] Make mount points before attempting to mount on them

BUG=chromium-os:11944
TEST=the correct test for this is a complete rebuild; I have this running, but it's going to take a little while.  I have tested this on the specific cases of ssh_auth_sock and .subversion

Change-Id: I61723356c58bfb7c2090e950208b8a6ab8fa2fc9

Review URL: http://codereview.chromium.org/6519022
---
 enter_chroot.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/enter_chroot.sh b/enter_chroot.sh
index ac34ad961f..ac54459e2c 100755
--- a/enter_chroot.sh
+++ b/enter_chroot.sh
@@ -143,6 +143,11 @@ function ensure_mounted {
   local mounted_path="$(readlink -f "${FLAGS_chroot}/$target")"
 
   if [ -z "$(mount | grep -F "on ${mounted_path} ")" ]; then
+    # Attempt to make the mountpoint as the user.  This depends on the
+    # fact that all mountpoints that should be owned by root are
+    # already present.
+    mkdir -p "${mounted_path}"
+
     # NB:  mount_args deliberately left unquoted
     debug mount ${mount_args} "${source}" "${mounted_path}"
     sudo -- mount ${mount_args} "${source}" "${mounted_path}" || \