commit 23da619f138d0b4ca148c3940ec8c4ff0827e396
author Brian Harring <ferringb@chromium.org> Sat Sep 01 01:39:03 2012 -0700
committer Gerrit <chrome-bot@google.com> Wed Sep 05 14:38:14 2012 -0700
tree 8e3c617e4f56ba1a113b390fad85bba6dded19e3
parent ece65e0633abb258db037f47c6fa5eec0640f5c3

Force our umount w/in the chroot.

Do this via ensuring that any common.sh invoker
of raw umount (say a root script) sees our umount
path.

Additionally, inject into default profiles our override,
and via an upgrade scriptlet.

BUG=chromium-os:23443
TEST=manual validation, trybot.

Change-Id: Ie2514f6e8d2e10a19ab8d11c8056177bc1a2fb4d
Reviewed-on: https://gerrit.chromium.org/gerrit/32088
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Ready: Brian Harring <ferringb@chromium.org>
Tested-by: Brian Harring <ferringb@chromium.org>

sdk_lib/enter_chroot.sh

diff --git a/sdk_lib/enter_chroot.sh b/sdk_lib/enter_chroot.sh
index 77a25d4..58cb0f5 100755
--- a/sdk_lib/enter_chroot.sh
+++ b/sdk_lib/enter_chroot.sh
@@ -274,8 +274,12 @@
         queue_mount /run/shm "--bind" /run/shm
       fi
     fi
-    queue_mount "${FLAGS_trunk}" "--bind" "${CHROOT_TRUNK_DIR}"
+    # Get path overrides for the chroot in place now- it's possible
+    # that they may be needed for early teardown.
+    queue_mount "${FLAGS_trunk}/src/scripts/path-overrides" "--bind" \
+      "/usr/local/path-overrides"
 
+    queue_mount "${FLAGS_trunk}" "--bind" "${CHROOT_TRUNK_DIR}"
 
     debug "Setting up referenced repositories if required."
     REFERENCE_DIR=$(git config --file  \