From d569a90bbde72ad2ddef49302a4c799271cb20e9 Mon Sep 17 00:00:00 2001
From: Dale Curtis <dalecurtis@chromium.org>
Date: Wed, 2 Feb 2011 20:30:14 -0800
Subject: [PATCH] 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
---
 mount_gpt_image.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/mount_gpt_image.sh b/mount_gpt_image.sh
index 1534105182..87324cbbbe 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