Fix vm lib to work both in/out chroot.

lib/cros_vm_lib.sh

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # Common vm functions for use in crosutils.
 
 DEFINE_string kvm_pid "" \
   "Use this pid file.  If it exists and is set, use the vm specified by pid."
 DEFINE_boolean no_graphics ${FLAGS_FALSE} "Runs the KVM instance silently."
 DEFINE_boolean persist "${FLAGS_FALSE}" "Persist vm."
@@ skipping 73 matching lines @@
       -net user,hostfwd=tcp::${FLAGS_ssh_port}-:22 \
       -hda "${1}"
 
     info "KVM started with pid stored in ${KVM_PID_FILE}"
     LIVE_VM_IMAGE="${1}"
   fi
 }
 
 # Checks to see if we can access the target virtual machine with ssh.
 function ssh_ping() {
-  "${SCRIPT_ROOT}/ssh_test.sh" \
+  # TODO(sosa): Remove outside chroot use once all callers work inside chroot.
+  local cmd
+  if [ $INSIDE_CHROOT -ne 1 ]; then
+    cmd="${GCLIENT_ROOT}/src/scripts/ssh_test.sh"
+  else
+    cmd=/usr/lib/crosutils/ssh_test.sh
+  fi
+  "${cmd}" \
     --ssh_port=${FLAGS_ssh_port} \
     --remote=127.0.0.1 >&2
 }
 
 # Tries to ssh into live image $1 times.  After first failure, a try involves
 # shutting down and restarting kvm.
 function retry_until_ssh() {
   local can_ssh_into=1
   local max_retries=3
   local retries=0
@@ skipping 19 matching lines @@
     if [ -n "${pid}" ]; then
       echo "Killing ${pid}" >&2
       blocking_kill ${pid} 1 16 || blocking_kill 9 1
       sudo rm "${KVM_PID_FILE}"
     else
       echo "No kvm pid found to stop." >&2
       return 1
     fi
   fi
 }