scripts: call devserver/payload generators from chroot & delete moved scripts

image_to_live.sh

 #!/bin/bash
 
 # Copyright (c) 2009-2010 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.
 
 # --- BEGIN COMMON.SH BOILERPLATE ---
 # Load common CrOS utilities.  Inside the chroot this file is installed in
@@ skipping 162 matching lines @@
         --proxy_port ${FLAGS_proxy_port}"
   fi
 
   [ ${FLAGS_for_vm} -eq ${FLAGS_TRUE} ] && \
       devserver_flags="${devserver_flags} --for_vm"
 
   devserver_flags="${devserver_flags} \
       --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" &
 
   info "Waiting on devserver to start"
   info "note: be patient as the server generates the update before starting."
   until netstat -anp 2>&1 | grep 0.0.0.0:${FLAGS_devserver_port} > /dev/null; do
     sleep 5
     echo -n "."
     if ! pgrep -f start_devserver > /dev/null; then
@@ skipping 21 matching lines @@
   # 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.
-  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 for start_devserver so we
shouldn't check for the other.

+      -- 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}"
 }
 
 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"
@@ skipping 201 matching lines @@
     local release_description=$(echo ${REMOTE_OUT} | cut -d '=' -f 2)
     info "Update was successful and rebooted to $release_description"
   fi
 
   print_time_elapsed
 
   exit 0
 }
 
 main $@