cros_run_vm_update - Issue 6736023: Install test scripts into chroot.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cros_run_vm_update

Issue 6736023: Install test scripts into chroot. (Closed) Base URL: http://git.chromium.org/git/crostestutils.git@master

Patch Set: Remove vm scripts from makefile 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:

Index: cros_run_vm_update

diff --git a/cros_run_vm_update b/cros_run_vm_update

index 6520adade9c2adf495ad089fa9388eab9511afc4..c1f54c55a6dc9083bc9d25c132e8557de89ddf65 100755

--- a/cros_run_vm_update

+++ b/cros_run_vm_update

@@ -6,11 +6,8 @@

# Updates an existing vm image with another image.

-. $(dirname "$(readlink -f "$0")")/outside_chroot_common.sh 2> /dev/null ||

- SCRIPT_ROOT=/usr/lib/crosutils

-. "${SCRIPT_ROOT}/common.sh" ||

- (echo "Unable to load common.sh" && false) ||

- exit 1

+. $(dirname "$(readlink -f "$0")")/outside_chroot_common.sh || exit 1

+. "${SCRIPT_ROOT}/common.sh" || exit 1

. "${SCRIPT_ROOT}/lib/cros_vm_lib.sh" || die "Unable to load cros_vm_lib.sh"

DEFINE_string payload "" "Full name of the payload to update with."

@@ -50,7 +47,7 @@ if [ -n "${FLAGS_proxy_port}" ]; then

IMAGE_ARGS="${IMAGE_ARGS} --proxy_port=${FLAGS_proxy_port}"

-"${SCRIPTS_DIR}/image_to_live.sh" \

+"${SCRIPT_ROOT}/image_to_live.sh" \

--for_vm \

--remote=127.0.0.1 \

--ssh_port=${FLAGS_ssh_port} \

« no previous file with comments | « cros_run_vm_test ('k') | outside_chroot_common.sh » ('j') | no next file with comments »