| Index: ssh_test.sh | 
| diff --git a/ssh_test.sh b/ssh_test.sh | 
| index 8048150edb43406711a0a9b8971cd6f2daced3f2..ef5eb574918771bb37e5a7b83f8fd65ff565e18c 100755 | 
| --- a/ssh_test.sh | 
| +++ b/ssh_test.sh | 
| @@ -8,8 +8,28 @@ | 
| # a code of 0 if successful and non-zero otherwise. Used by test infrastructure | 
| # scripts. | 
|  | 
| -. "$(dirname "$0")/common.sh" | 
| -. "$(dirname "$0")/remote_access.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 --- | 
| + | 
| +. "${SCRIPT_ROOT}/remote_access.sh" || die "Unable to load remote_access.sh" | 
|  | 
| function cleanup { | 
| cleanup_remote_access | 
| @@ -17,7 +37,7 @@ function cleanup { | 
| } | 
|  | 
| function main() { | 
| -  cd $(dirname "$0") | 
| +  cd "${SCRIPTS_DIR}" | 
|  | 
| FLAGS "$@" || exit 1 | 
| eval set -- "${FLAGS_ARGV}" | 
|  |