mount_gpt_image.sh - Issue 6312112: Fix recent change which prevented mount_gpt_image from running outside chroot.

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: mount_gpt_image.sh

Issue 6312112: Fix recent change which prevented mount_gpt_image from running outside chroot. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/crosutils.git@master

Patch Set: Switch to SRC_ROOT Created 9 years, 11 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:

View side-by-side diff with in-line comments

Download patch

Index: mount_gpt_image.sh

diff --git a/mount_gpt_image.sh b/mount_gpt_image.sh

index 1534105182d4455592504814e19bfb9f02685991..87324cbbbe617b8bf986162add7b167d8268fb35 100755

--- a/mount_gpt_image.sh

+++ b/mount_gpt_image.sh

@@ -28,12 +28,14 @@ find_common_sh

. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)

# --- END COMMON.SH BOILERPLATE ---

-# Need to be inside the chroot to load chromeos-common.sh

-assert_inside_chroot

+if [ $INSIDE_CHROOT -ne 1 ]; then

+ INSTALL_ROOT="$SRC_ROOT/platform/installer/"

+else

+ INSTALL_ROOT=/usr/lib/installer/

+fi

# Load functions and constants for chromeos-install

-. "/usr/lib/installer/chromeos-common.sh" || \

- die "Unable to load /usr/lib/installer/chromeos-common.sh"

+. "${INSTALL_ROOT}/chromeos-common.sh" || \

+ die "Unable to load ${INSTALL_ROOT}/chromeos-common.sh"

locate_gpt

« no previous file with comments | « no previous file | no next file » | no next file with comments »