Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(555)

Unified Diff: lib/cros_vm_lib.sh

Issue 6750012: Fix vm lib to work both in/out chroot. (Closed) Base URL: http://git.chromium.org/git/crosutils.git@master
Patch Set: Fix sp Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/cros_vm_lib.sh
diff --git a/lib/cros_vm_lib.sh b/lib/cros_vm_lib.sh
index 1246baae39f14ea1bbeb930a509195f68cd26dd0..525729db0fba0671182ad192d06bf5e0cb9caf88 100644
--- a/lib/cros_vm_lib.sh
+++ b/lib/cros_vm_lib.sh
@@ -91,7 +91,14 @@ function start_kvm() {
# 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
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698