Add an update_url parameter to image_to_live.

src/scripts/image_to_live.sh

Index: src/scripts/image_to_live.sh
diff --git a/src/scripts/image_to_live.sh b/src/scripts/image_to_live.sh
index 1fcf312893d6c88ca8a3634e4a977ae2a5d4c68a..c75e3684acbcf75c0a755b6157b22631feb102b5 100755
--- a/src/scripts/image_to_live.sh
+++ b/src/scripts/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}' >> \

[seano, 2010/05/12 17:17:42]

You don't need to do this, memento_updater.sh accepts the --omaha_url as a
direct parameter.

[ericli, 2010/05/12 17:57:08]

I guess the problem is the stateful partition update.

It will still use /etc/lsb-release indirectly, and can not accept command line
argument yet, as well as ping_omaha.

So this should be the simplest, and safest change.

On 2010/05/12 17:17:42, seano wrote:

           /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