Fixed stateful update in image_to_live.

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.
@@ skipping 51 matching lines @@
     sleep .5
     echo -n "."
   done
   echo ""
 }
 
 # Copys stateful update script which fetches the newest stateful update
 # from the dev server and prepares the update. chromeos_startup finishes
 # the update on next boot.
 function copy_stateful_update {
-  info "Starting stateful update."
-  local dev_dir="$(dirname $0)/../platform/dev"
+  local dev_url=$(get_devserver_url)
+  local stateful_url=""
+
+  # Assume users providing an update url are using an archive_dir path.
+  if [ -n "${FLAGS_update_url}" ]; then
+    stateful_url=$(echo ${dev_url} | sed -e "s/update/static\/archive/")
+  else
+    stateful_url=$(echo ${dev_url} | sed -e "s/update/static/")
+  fi
+
+  info "Starting stateful update using URL ${stateful_url}"
 
   # Copy over update script and run update.
-  remote_cp_to "$dev_dir/stateful_update" "/tmp"
-  remote_sh "/tmp/stateful_update"
+  local dev_dir="$(dirname $0)/../platform/dev"
+  remote_cp_to "${dev_dir}/stateful_update" "/tmp"
+  remote_sh "/tmp/stateful_update ${stateful_url}"
 }
 
 function get_update_args {
   if [ -z ${1} ]; then
     die "No url provided for update."
   fi
   local update_args="--omaha_url ${1}"
   if [[ ${FLAGS_ignore_version} -eq ${FLAGS_TRUE} ]]; then
     info "Forcing update independent of the current version"
     update_args="--update ${update_args}"
@@ skipping 109 matching lines @@
   fi
 
   remote_sh "grep ^CHROMEOS_RELEASE_DESCRIPTION= /etc/lsb-release"
   local release_description=$(echo ${REMOTE_OUT} | cut -d '=' -f 2)
   info "Update was successful and rebooted to $release_description"
 
   return 0
 }
 
 main $@