Index: bin/cros_resign_image.sh |
diff --git a/bin/cros_resign_image.sh b/bin/cros_resign_image.sh |
index d6709ef20e73059eec83a0bb17385bcea250ec01..3d5e6a85eb9d782632c20091e42c7bfc12530ca2 100755 |
--- a/bin/cros_resign_image.sh |
+++ b/bin/cros_resign_image.sh |
@@ -7,11 +7,33 @@ |
# Script to resign the kernel partition generated in the output of build_image |
# with keys of our choosing. |
-# 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" |
- |
-. "$(dirname "$0")/../chromeos-common.sh" # for partoffset and partsize |
+# --- 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" |
locate_gpt |