make_factory_package.sh - Issue 6462007: make_factory_package: allow calling from outside the 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: make_factory_package.sh

Issue 6462007: make_factory_package: allow calling from outside the chroot (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/crosutils.git@master

Patch Set: Created 9 years, 10 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: make_factory_package.sh

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

index bc68119e3c00154d4730af698e1c963de779967f..04366d79b19f04b5bed0b166a565b9595db349e8 100755

--- a/make_factory_package.sh

+++ b/make_factory_package.sh

@@ -32,11 +32,10 @@ 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

# Load functions and constants for chromeos-install

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

+# NOTE: This script needs to be called from outside the chroot.

+. "/usr/lib/installer/chromeos-common.sh" &> /dev/null || \

+. "${SRC_ROOT}/platform/installer/chromeos-common.sh" || \

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

# Load functions designed for image processing

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