Add an update_url parameter to image_to_live.

src/scripts/image_to_live.sh

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to update an image onto a live running ChromiumOS instance.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
 
 . "$(dirname $0)/common.sh"
 . "$(dirname $0)/remote_access.sh"
 
 DEFINE_boolean ignore_version ${FLAGS_TRUE} \
   "Ignore existing version on running instance and always update"
 DEFINE_boolean ignore_hostname ${FLAGS_TRUE} \
   "Ignore existing AU hostname on running instance use this hostname"
 DEFINE_boolean update_known_hosts ${FLAGS_FALSE} \
   "Update your known_hosts with the new remote instance's key"
 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
   # || true instead.
   sudo pkill -f devserver\.py || true
 }
 
 function cleanup {
   echo "Killing dev server."
   kill_all_devservers
@@ skipping 40 matching lines @@
 
   if [[ ${FLAGS_ignore_version} -eq ${FLAGS_TRUE} ]]; then
     echo "Forcing update independent of the current version"
     remote_sh "cat /etc/lsb-release |\
         grep -v CHROMEOS_RELEASE_VERSION > /etc/lsb-release~;\
         mv /etc/lsb-release~ /etc/lsb-release; \
         echo 'CHROMEOS_RELEASE_VERSION=0.0.0.0' >> /etc/lsb-release"
   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
 }
 
 function run_auto_update {
   echo "Starting update"
   local update_file=/var/log/softwareupdate.log
   # Clear it out so we don't see a prior run and make sure it
   # exists so the first tail below can't fail if it races the
@@ skipping 80 matching lines @@
 
   remote_access_init
 
   if remote_sh [ -e /tmp/memento_autoupdate_completed ]; then
     echo "Machine has been updated but not yet rebooted.  Rebooting it now."
     echo "Rerun this script if you still wish to update it."
     remote_reboot
     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
 
   if ! run_auto_update; then
     echo "Update was not successful."
     exit 1
   fi
 
   if ! copy_stateful_update; then
     echo "Stateful update was not successful."
@@ skipping 11 matching lines @@
   fi
 
   remote_sh "grep ^CHROMEOS_RELEASE_DESCRIPTION= /etc/lsb-release"
   local release_description=$(echo $REMOTE_OUT | cut -d '=' -f 2)
   echo "Update was successful and rebooted to $release_description"
 
   return 0
 }
 
 main $@