crosutils: Always pass an image to devserver so it can pregenerate

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.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 12 matching lines @@
   "Perform update of root partition."
 DEFINE_boolean update_known_hosts ${FLAGS_FALSE} \
   "Update your known_hosts with the new remote instance's key."
 DEFINE_string update_log "update_engine.log" \
   "Path to log for the update_engine."
 DEFINE_boolean verify ${FLAGS_TRUE} "Verify image on device after update."
 
 # Flags for devserver.
 DEFINE_string archive_dir "" \
   "Update using the test image in the image.zip in this directory." a
+DEFINE_string board "" "Override the board reported by the target"
 DEFINE_integer devserver_port 8080 \
   "Port to use for devserver."
 DEFINE_string image "" \
   "Update with this image path that is in this source checkout." i
 DEFINE_string src_image "" \
   "Create a delta update by passing in the image on the remote machine."
 DEFINE_boolean update_stateful ${FLAGS_TRUE} \
   "Perform update of stateful partition e.g. /var /usr/local."
 DEFINE_string update_url "" "Full url of an update image."
 
@@ skipping 73 matching lines @@
     devserver_flags="${devserver_flags} \
         --image $(reinterpret_path_for_chroot ${FLAGS_image})"
     IMAGE_PATH="${FLAGS_image}"
   elif [ -n "${FLAGS_archive_dir}" ]; then
     devserver_flags="${devserver_flags} \
         --archive_dir $(reinterpret_path_for_chroot ${FLAGS_archive_dir}) -t"
     IMAGE_PATH="${FLAGS_archive_dir}/chromiumos_test_image.bin"
   else
     # IMAGE_PATH should be the newest image and learn the board from
     # the target.
-    FLAGS_board=""
     learn_board
     IMAGE_PATH="$($(dirname "$0")/get_latest_image.sh --board="${FLAGS_board}")"
     IMAGE_PATH="${IMAGE_PATH}/chromiumos_image.bin"
+    devserver_flags="${devserver_flags} \
+        --image $(reinterpret_path_for_chroot ${IMAGE_PATH})"
   fi
 
   devserver_flags="${devserver_flags} \
       --src_image=\"$(reinterpret_path_for_chroot ${FLAGS_src_image})\""
 
   info "Starting devserver with flags ${devserver_flags}"
   ./enter_chroot.sh "sudo ./start_devserver ${devserver_flags} \
        --client_prefix=ChromeOSUpdateEngine \
        --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
+      echo "Devserver failed, see dev_server.log."
+      exit 1
+    fi
   done
   echo ""
 }
 
 # Copies 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 run_stateful_update {
   local dev_url=$(get_devserver_url)
   local stateful_url=""
@@ skipping 228 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 $@