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

Unified Diff: image_to_live.sh

Issue 6576023: scripts: call devserver/payload generators from chroot & delete moved scripts (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/crosutils.git@master
Patch Set: Possible fix for calling image_to_target from outside the chroot Created 9 years, 10 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
« bin/cros_image_to_target.py ('K') | « generate_au_zip.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: image_to_live.sh
diff --git a/image_to_live.sh b/image_to_live.sh
index c2aafc3c639ffa2c3b5126efe24ef62139bd3753..df1de4b181061a8f336cd031c296127448e406ea 100755
--- a/image_to_live.sh
+++ b/image_to_live.sh
@@ -180,7 +180,7 @@ function start_dev_server {
--src_image=\"$(reinterpret_path_for_chroot ${FLAGS_src_image})\""
info "Starting devserver with flags ${devserver_flags}"
- ./enter_chroot.sh -- sudo sh -c "./start_devserver ${devserver_flags} \
+ ./enter_chroot.sh -- sudo sh -c "start_devserver ${devserver_flags} \
--client_prefix=ChromeOSUpdateEngine \
--board=${FLAGS_board} \
--port=${FLAGS_devserver_port} > ${FLAGS_server_log} 2>&1" &
@@ -222,8 +222,13 @@ function run_stateful_update {
info "Starting stateful update using URL ${stateful_url}"
# Copy over update script and run update.
- local dev_dir="${SCRIPTS_DIR}/../platform/dev"
- remote_cp_to "${dev_dir}/stateful_update" "/tmp"
+ if ! local stateful_update_script="$(./enter_chroot.sh \
sosa 2011/03/01 17:40:48 Why is the which check necessary? We don't check
+ -- sh -c "which stateful_update")"; then
+ die "The script stateful_update was not found!"
+ fi
+ local chroot_path="${SCRIPTS_DIR}/../../chroot"
+
+ remote_cp_to "${chroot_path}/${stateful_update_script}" "/tmp"
remote_sh "/tmp/stateful_update ${stateful_update_args} ${stateful_url}"
}
« bin/cros_image_to_target.py ('K') | « generate_au_zip.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698