| Index: bin/cros_start_vm | 
| diff --git a/bin/cros_start_vm b/bin/cros_start_vm | 
| index 63079203495a0ef49b708a787fda7a1cf4389943..f88b1eda4da79e53ca726bfe7743139362811496 100755 | 
| --- a/bin/cros_start_vm | 
| +++ b/bin/cros_start_vm | 
| @@ -6,9 +6,30 @@ | 
| # | 
| # Simple wrapper scipt to start a vm using the vm lib. | 
|  | 
| -. "$(dirname $0)/../common.sh" | 
| -. "$(dirname $0)/../lib/cros_vm_lib.sh" | 
| -. "$(dirname "$0")/../lib/cros_vm_constants.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}/lib/cros_vm_lib.sh" || die "Unable to load cros_vm_lib.sh" | 
| +. "${SCRIPT_ROOT}/lib/cros_vm_constants.sh" || \ | 
| +  die "Unable to load cros_vm_constants.sh" | 
|  | 
| get_default_board | 
|  | 
|  |