commit f264b82dd2c2bb8c58a042c4ca231488e8530440
author Brian Harring <ferringb@chromium.org> Sat Sep 01 01:39:03 2012 -0700
committer Gerrit <chrome-bot@google.com> Thu Sep 06 10:34:33 2012 -0700
tree 2c0ec55fab6ff3f61f6ff058f37fa8d0d68f23b7
parent d5e3c01c08a0d8a86e40d1a3fc230ee0422424ae

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.

This is round two; originally appeared as CL:32088, was
reverted due to:
https://uberchromegw.corp.google.com/i/chromiumos/builders/chromiumos%20sdk/builds/2314/steps/BuildBoard/logs/stdio

The fix however is just adding a single sudo mkdir. :/

BUG=chromium-os:23443
TEST=cros_sdk --replace --bootstrap
TEST=cros_sdk --replace

Change-Id: I0dc7522a9c623f40081d4f138cea0c2c45171fea
Reviewed-on: https://gerrit.chromium.org/gerrit/32365
Commit-Ready: Brian Harring <ferringb@chromium.org>
Tested-by: Brian Harring <ferringb@chromium.org>
Reviewed-by: Chris Sosa <sosa@chromium.org>

sdk_lib/make_chroot.sh

diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index f857f0f..6f957c9 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -177,6 +177,11 @@
    sudo bash -e "${SCRIPT_ROOT}/chroot_version_hooks.d/45_rewrite_sudoers.d" \
      "${FLAGS_chroot}" "${USER}" "${ENVIRONMENT_WHITELIST[@]}"
 
+   # Turn on the path overrides; subshelled to protect our env from whatever
+   # vars the scriptlet may bleed.
+   ( CROS_CHROOT="${FLAGS_chroot}"
+     . "${SCRIPT_ROOT}/chroot_version_hooks.d/47_path_overrides" )
+
    sudo find "${FLAGS_chroot}/etc/"sudoers* -type f -exec chmod 0440 {} +
    # Fix bad group for some.
    sudo chown -R root:root "${FLAGS_chroot}/etc/"sudoers*