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

Unified Diff: lib/cros_vm_lib.sh

Issue 6240018: This starts to fix the scripts so that they load from /usr/lib/crosutils (Closed) Base URL: http://git.chromium.org/git/crosutils.git@master
Patch Set: fixing bad merge Created 9 years, 11 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 | « kernel_fetcher.sh ('k') | make_developer_script_runner.sh » ('j') | 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 8b70ad2c99051c0c5169f88fb5341401f52bee83..3a50a627057c5ee758cde10b9c75ce8f4c045314 100644
--- a/lib/cros_vm_lib.sh
+++ b/lib/cros_vm_lib.sh
@@ -69,7 +69,7 @@ function start_kvm() {
fi
local net_option="-net nic,model=virtio"
- if [ -f "$(dirname $1)/.use_e1000" ]; then
+ if [ -f "$(dirname "$1")/.use_e1000" ]; then
info "Detected older image, using e1000 instead of virtio."
net_option="-net nic,model=e1000"
fi
@@ -91,7 +91,7 @@ function start_kvm() {
# Checks to see if we can access the target virtual machine with ssh.
function ssh_ping() {
- "$(dirname $0)"/../ssh_test.sh \
+ "${SCRIPT_ROOT}/ssh_test.sh" \
--ssh_port=${FLAGS_ssh_port} \
--remote=127.0.0.1 >&2
}
« no previous file with comments | « kernel_fetcher.sh ('k') | make_developer_script_runner.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698