src/scripts/common.sh - Issue 1736025: Added restart_in_chroot_if_needed to common.sh.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/scripts/common.sh

Issue 1736025: Added restart_in_chroot_if_needed to common.sh. (Closed) Base URL: http://src.chromium.org/git/chromiumos.git

Patch Set: Reverted mod_image_for_test.sh and removed line from common.sh. Created 10 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/scripts/common.sh

diff --git a/src/scripts/common.sh b/src/scripts/common.sh

index 52bf63277954f6ef2ce3fcbc3ae75e540f186b25..accb468aaf15fe79ec422adc0b3aaf0d7aa98cfd 100644

--- a/src/scripts/common.sh

+++ b/src/scripts/common.sh

@@ -207,6 +207,16 @@ function make_pkg_common {

popd

}

+# Enter a chroot and restart the current script if needed

+function restart_in_chroot_if_needed {

+ if [ $INSIDE_CHROOT -ne 1 ]

+ then

+ # Equivalent to enter_chroot.sh -- <current command>

+ exec $SCRIPTS_DIR/enter_chroot.sh -- \

+ $CHROOT_TRUNK_DIR/src/scripts/$(basename $0) $*

+ fi

# Fail unless we're inside the chroot. This guards against messing up your

# workstation.

function assert_inside_chroot {

« no previous file with comments | « src/scripts/build_tests.sh ('k') | src/scripts/run_tests.sh » ('j') | no next file with comments »