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

make_developer_script_runner.sh

Index: make_developer_script_runner.sh
diff --git a/make_developer_script_runner.sh b/make_developer_script_runner.sh
index 32d3133c1a7fb6c7fc197507189efe74d8977e5b..134bf080e4c38159cfec443412a2e9fd92e86050 100755
--- a/make_developer_script_runner.sh
+++ b/make_developer_script_runner.sh
@@ -9,12 +9,33 @@
 # It is very straight forward, top to bottom to show clearly what is
 # little is needed to create a developer shim to run a signed script.
 
-# 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"
 
 DEFINE_integer statefulfs_size 2 \
   "Number of mebibytes to use for the stateful filesystem"