From 5d0248feb85aa27373b662895e1b4b46d7b8d072 Mon Sep 17 00:00:00 2001 From: Andrew de los Reyes Date: Fri, 12 Feb 2010 16:12:31 -0800 Subject: [PATCH] enter_chroot: bind mount depot_tools if present outside chroot. Another CL is coming to automatically add depot_tools to the PATH inside the chroot. It's in a different repo. Review URL: http://codereview.chromium.org/605016 --- enter_chroot.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/enter_chroot.sh b/enter_chroot.sh index ab5418e6cc..89f29328b1 100755 --- a/enter_chroot.sh +++ b/enter_chroot.sh @@ -63,6 +63,7 @@ set -e INNER_CHROME_ROOT="/home/$USER/chrome_root" # inside chroot CHROME_ROOT_CONFIG="/var/cache/chrome_root" # inside chroot +INNER_DEPOT_TOOLS_ROOT="/home/$USER/depot_tools" # inside chroot sudo chmod 0777 "$FLAGS_chroot/var/lock" @@ -113,6 +114,17 @@ function setup_env { sudo mount --bind "$CHROME_ROOT" "$MOUNTED_PATH" fi fi + + MOUNTED_PATH="$(readlink -f "${FLAGS_chroot}${INNER_DEPOT_TOOLS_ROOT}")" + if [ -z "$(mount | grep -F "on $MOUNTED_PATH")" ] + then + if [ $(which gclient 2>/dev/null) ]; then + echo "Mounting depot_tools" + DEPOT_TOOLS=$(dirname $(which gclient) ) + mkdir -p "$MOUNTED_PATH" + sudo mount --bind "$DEPOT_TOOLS" "$MOUNTED_PATH" + fi + fi ) 200>>"$LOCKFILE" }