From 9adee78b5c2f5f385042effed75b841922859222 Mon Sep 17 00:00:00 2001 From: Eric Li Date: Wed, 12 May 2010 11:53:39 -0700 Subject: [PATCH] Add an update_url parameter to image_to_live. So it could update netbook from a dev server hosted on another server. Review URL: http://codereview.chromium.org/2012011 --- image_to_live.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/image_to_live.sh b/image_to_live.sh index 1fcf312893..c75e3684ac 100755 --- a/image_to_live.sh +++ b/image_to_live.sh @@ -22,6 +22,7 @@ DEFINE_boolean verbose ${FLAGS_FALSE} \ "Whether to output verbose information for debugging." DEFINE_integer devserver_port 8080 \ "Port to use for devserver" +DEFINE_string update_url "" "Full url of an update image" function kill_all_devservers { # Using ! here to avoid exiting with set -e is insufficient, so use @@ -82,13 +83,17 @@ function prepare_update_metadata { fi if [ ${FLAGS_ignore_hostname} -eq ${FLAGS_TRUE} ]; then - devserver_url="http://$HOSTNAME:${FLAGS_devserver_port}" + if [ -z ${FLAGS_update_url} ]; then + devserver_url="http://$HOSTNAME:${FLAGS_devserver_port}/update" + else + devserver_url="${FLAGS_update_url}" + fi echo "Forcing update from ${devserver_url}" remote_sh "cat /etc/lsb-release |\ grep -v '^CHROMEOS_AUSERVER=' |\ grep -v '^CHROMEOS_DEVSERVER=' > /etc/lsb-release~;\ mv /etc/lsb-release~ /etc/lsb-release; \ - echo 'CHROMEOS_AUSERVER=${devserver_url}/update' >> \ + echo 'CHROMEOS_AUSERVER=${devserver_url}' >> \ /etc/lsb-release; \ echo 'CHROMEOS_DEVSERVER=${devserver_url}' >> /etc/lsb-release" fi @@ -189,7 +194,10 @@ function main() { exit 1 fi - start_dev_server + if [ -z "${FLAGS_update_url}" ]; then + # only start local devserver if no update url specified. + start_dev_server + fi prepare_update_metadata