| Index: bootperf-bin/bootperf | 
| diff --git a/bootperf-bin/bootperf b/bootperf-bin/bootperf | 
| index 5c0ce6613bac4794770ad02f82552758bf69a25e..78aa64102ce21c25afa67b979eee63d25a301766 100755 | 
| --- a/bootperf-bin/bootperf | 
| +++ b/bootperf-bin/bootperf | 
| @@ -11,14 +11,31 @@ | 
| # chroot environment. | 
| # | 
|  | 
| -# SCRIPT_DIR="$(cd "$(dirname $0)/.." ; pwd)" | 
| -SCRIPT_DIR=$HOME/trunk/src/scripts | 
| -. "$SCRIPT_DIR/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 --- | 
|  | 
| DEFINE_string output_dir "" "output directory for results" o | 
| DEFINE_boolean keep_logs "$FLAGS_FALSE" "keep autotest results" k | 
|  | 
| -RUN_TEST="$SCRIPT_DIR/run_remote_tests.sh" | 
| +RUN_TEST="$SCRIPTS_DIR/run_remote_tests.sh" | 
| TEST=server/site_tests/platform_BootPerfServer/control | 
| TMP_RESULTS="/tmp/bootperf.$(date '+%Y%j%H%M').$$" | 
| RESULTS_DIR=platform_BootPerfServer/platform_BootPerfServer/results | 
|  |