mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-11-29 14:31:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix vm lib to work both in/out chroot.

Browse Source 
Change-Id: I41ca87d7970ce59c7bbbc0e8cdaeaf5bedb43776

BUG=chromium-os:13498
TEST=Ran it both in/out

Review URL: http://codereview.chromium.org/6750012
This commit is contained in:
Chris Sosa 2011-03-25 15:58:20 -07:00
parent e65e500f53
commit 37cccf3c33
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/cros_vm_lib.sh
View File

@ -91,7 +91,14 @@ function start_kvm() {
# Checks to see if we can access the target virtual machine with ssh. # Checks to see if we can access the target virtual machine with ssh.
function ssh_ping() { 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} \ --ssh_port=${FLAGS_ssh_port} \
--remote=127.0.0.1 >&2 --remote=127.0.0.1 >&2
} }