Index: mount_gpt_image.sh |
diff --git a/mount_gpt_image.sh b/mount_gpt_image.sh |
index 1c95a91eb17ab5d2c7b4e5af23511ef454d6eb5d..1534105182d4455592504814e19bfb9f02685991 100755 |
--- a/mount_gpt_image.sh |
+++ b/mount_gpt_image.sh |
@@ -7,10 +7,34 @@ |
# Helper script that mounts chromium os image from a device or directory |
# and creates mount points for /var and /usr/local (if in dev_mode). |
-. "$(dirname "$0")/common.sh" |
+# --- BEGIN COMMON.SH BOILERPLATE --- |
+# Load common CrOS utilities. Inside the chroot this file is installed in |
+# /usr/lib/crosutils. Outside the chroot we find it relative to the script's |
+# location. |
+find_common_sh() { |
+ local common_paths=(/usr/lib/crosutils $(dirname "$(readlink -f "$0")")) |
+ local path |
+ |
+ SCRIPT_ROOT= |
+ for path in "${common_paths[@]}"; do |
+ if [ -r "${path}/common.sh" ]; then |
+ SCRIPT_ROOT=${path} |
+ break |
+ fi |
+ done |
+} |
+ |
+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" || \ |
+ die "Unable to load /usr/lib/installer/chromeos-common.sh" |
-# For functions related to gpt images. |
-. "$(dirname "$0")/chromeos-common.sh" |
locate_gpt |
get_default_board |