Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(569)

Unified Diff: src/scripts/enter_chroot.sh

Issue 431001: build: Update build_image.sh for non-~/chromeos setups. (Closed)
Patch Set: Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/scripts/build_image.sh ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/scripts/enter_chroot.sh
diff --git a/src/scripts/enter_chroot.sh b/src/scripts/enter_chroot.sh
index acfa84682de4b31e586941075c0d8c640fbad4a0..ff5c1956dfc84d7d44b9e79c9eaaf397d860b580 100755
--- a/src/scripts/enter_chroot.sh
+++ b/src/scripts/enter_chroot.sh
@@ -103,7 +103,7 @@ setup_env
if [ $FLAGS_revision -eq $FLAGS_TRUE ]
then
- # Get the subversion revision to pass into the chroot.
+ # Get the subversion revision to pass into the chroot.
#
# This must be determined outside the chroot because (1) there is no
# svn/git inside the chroot, and (2) if there were it would likely be
@@ -125,10 +125,12 @@ then
REVISION="CHROMEOS_REVISION=$REVISION"
fi
-# Run command or interactive shell
-sudo chroot "$FLAGS_chroot" sudo -i -u $USER $REVISION "$@"
+# Run command or interactive shell. Also include the non-chrooted path to
+# the source trunk for scripts that may need to print it (e.g.
+# build_image.sh).
+sudo chroot "$FLAGS_chroot" sudo -i -u $USER $REVISION \
+ EXTERNAL_TRUNK_PATH="${FLAGS_trunk}" "$@"
# Remove trap and explicitly unmount
trap - EXIT
teardown_env
-
« no previous file with comments | « src/scripts/build_image.sh ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698