Add simple update test to pfq.

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 223 matching lines @@
 
 function truncate_update_log {
   remote_sh "> /var/log/update_engine.log"
 }
 
 function get_update_log {
   remote_sh "cat /var/log/update_engine.log"
   echo "${REMOTE_OUT}" > "${FLAGS_update_log}"
 }
 
-
 # Returns ${1} reported by the update client e.g. PROGRESS, CURRENT_OP.
 function get_update_var {
   remote_sh "${UPDATER_BIN} --status 2> /dev/null |
       grep ${1} |
       cut -f 2 -d ="
   echo "${REMOTE_OUT}"
 }
 
 # Returns the current status / progress of the update engine.
 # This is expected to run in its own thread.
 function status_thread {
   local timeout=5
-  # Let update engine receive call to ping the dev server.
+
   info "Devserver handling ping.  Check ${FLAGS_server_log} for more info."
   sleep ${timeout}
 
-  # The devserver generates images when the update engine checks for updates.
-  while [ $(get_update_var CURRENT_OP) = ${UPDATER_UPDATE_CHECK} ]; do
-    echo -n "." && sleep ${timeout}
+  local current_state=""
+  local next_state="$(get_update_var CURRENT_OP)"
+
+  while [ "${current_state}" != "${UPDATER_NEED_REBOOT}" ] && \
+      [ "${current_state}" != "${UPDATER_IDLE}" ]; do
+    if [ "${current_state}" != "${next_state}" ]; then
+      info "State of updater has changed to: ${next_state}"
+    else
+      echo -n "." && sleep ${timeout}
+    fi
+    if [ "${current_state}" = "${UPDATER_DOWNLOADING}" ]; then
+      echo "Download progress $(get_update_var PROGRESS)"

[petkov, 2011/01/07 22:17:29]

so you see ".Download progress " now? intentional?

[sosa, 2011/01/07 23:28:44]

Done.

+    fi
+    sleep ${timeout}

[petkov, 2011/01/07 22:17:29]

so, you sleep 2*timeout -- intentional?

[sosa, 2011/01/07 23:28:44]

Done.

+    current_state="${next_state}"
+    next_state="$(get_update_var CURRENT_OP)"
   done
-
-  info "Update generated.  Update engine downloading update."
-  while [ $(get_update_var CURRENT_OP) = ${UPDATER_DOWNLOADING} ]; do
-    echo "Download progress $(get_update_var PROGRESS)" && sleep ${timeout}
-  done
-
-  info "Download complete."
 }
 
 
 function run_auto_update {
   # Truncate the update log so our log file is clean.
   truncate_update_log
 
   local update_args="$(get_update_args "$(get_devserver_url)")"
   info "Starting update using args ${update_args}"
 
@@ skipping 122 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 $@