This starts to fix the scripts so that they load from /usr/lib/crosutils

make_factory_package.sh

Index: make_factory_package.sh
diff --git a/make_factory_package.sh b/make_factory_package.sh
index 715f1fd9b387d93ccc89b2029b5c6c2219c12d93..bc68119e3c00154d4730af698e1c963de779967f 100755
--- a/make_factory_package.sh
+++ b/make_factory_package.sh
@@ -11,15 +11,36 @@
 # miniomaha lives in src/platform/dev/ and miniomaha partition sets live
 # in src/platform/dev/static.
 
-# Load common constants.  This should be the first executable line.
-# The path to common.sh should be relative to your script's location.
-. "$(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
-. "$(dirname "$0")/chromeos-common.sh"
+. "/usr/lib/installer/chromeos-common.sh" || \
+  die "Unable to load /usr/lib/installer/chromeos-common.sh"
 
 # Load functions designed for image processing
-. "$(dirname "$0")/lib/cros_image_common.sh" ||
+. "${SCRIPT_ROOT}/lib/cros_image_common.sh" ||
   die "Cannot load required library: lib/cros_image_common.sh; Abort."
 
 get_default_board