Index: mk_memento_images.sh |
diff --git a/mk_memento_images.sh b/mk_memento_images.sh |
index 7a1074542777575e14729cf7b491f7ac0de6cf0e..9e8b609e0a3ce380a3d2733a13183e3244ec1096 100755 |
--- a/mk_memento_images.sh |
+++ b/mk_memento_images.sh |
@@ -10,8 +10,31 @@ |
set -e |
+# --- 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 --- |
+ |
+. "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1) |
+ |
# Load functions designed for image processing |
-if ! . "$(dirname "$0")/lib/cros_image_common.sh"; then |
+if ! . "${SCRIPT_ROOT}/lib/cros_image_common.sh"; then |
echo "ERROR: Cannot load required library: lib/cros_image_common.sh; Abort." |
exit 1 |
fi |