mirror of
https://github.com/flatcar/scripts.git
synced 2025-09-23 14:41:31 +02:00
Fix recent change which prevented mount_gpt_image from running outside chroot.
Change-Id: Id58de45b72522077179024ee0310c70d2af1a497 BUG=chromium-os:4230 TEST=Ran mount_gpt_image.sh inside/outside chroot. Review URL: http://codereview.chromium.org/6312112
This commit is contained in:
parent
fad7fecc4d
commit
d569a90bbd
@ -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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user