Add verify option to image_to_live.

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.
 
 . "$(dirname $0)/common.sh"
 . "$(dirname $0)/remote_access.sh"
 
 # Flags to control image_to_live.
 DEFINE_boolean ignore_hostname ${FLAGS_TRUE} \
   "Ignore existing AU hostname on running instance use this hostname."
 DEFINE_boolean ignore_version ${FLAGS_TRUE} \
   "Ignore existing version on running instance and always update."
 DEFINE_string server_log "dev_server.log" \
   "Path to log for the devserver."
 DEFINE_boolean update "${FLAGS_TRUE}" \
   "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_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_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."
 
 # Flags for stateful update.
 DEFINE_string stateful_update_flag "" \
   "Flag to pass to stateful update e.g. old, clean, etc." s
 
-UPDATER_BIN='/usr/bin/update_engine_client'
-UPDATER_IDLE='UPDATE_STATUS_IDLE'
-UPDATER_NEED_REBOOT='UPDATE_STATUS_UPDATED_NEED_REBOOT'
-UPDATER_UPDATE_CHECK='UPDATE_STATUS_CHECKING_FOR_UPDATE'
-UPDATER_DOWNLOADING='UPDATE_STATUS_DOWNLOADING'
+UPDATER_BIN="/usr/bin/update_engine_client"
+UPDATER_IDLE="UPDATE_STATUS_IDLE"
+UPDATER_NEED_REBOOT="UPDATE_STATUS_UPDATED_NEED_REBOOT"
+UPDATER_UPDATE_CHECK="UPDATE_STATUS_CHECKING_FOR_UPDATE"
+UPDATER_DOWNLOADING="UPDATE_STATUS_DOWNLOADING"
+
+IMAGE_PATH=""
 
 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 {
   if [ -z "${FLAGS_update_url}" ]; then
     kill_all_devservers
@@ skipping 25 matching lines @@
   echo "/home/${USER}/trunk/${relative_path}"
 }
 
 function start_dev_server {
   kill_all_devservers
   local devserver_flags=${FLAGS_devserver_port}
   # Parse devserver flags.
   if [ -n "${FLAGS_image}" ]; then
     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"
   fi
 
   info "Starting devserver with flags ${devserver_flags}"
   ./enter_chroot.sh "sudo ./start_devserver ${devserver_flags} \
        --client_prefix=ChromeOSUpdateEngine > ${FLAGS_server_log} 2>&1" &
 
   echo -n "Waiting on devserver to start"
   until netstat -anp 2>&1 | grep 0.0.0.0:${FLAGS_devserver_port} > /dev/null
   do
     sleep .5
@@ skipping 146 matching lines @@
         info "Not yet rebooted"
       else
         info "Rebooted and responding"
         break
       fi
     fi
     sleep .5
   done
 }
 
+function verify_image {
+  info "Verifying image."
+  "${SCRIPTS_DIR}/mount_gpt_image.sh" --from "$(dirname ${IMAGE_PATH})" \
+                     --image "$(basename ${IMAGE_PATH})" \
+                     --read_only
+
+  local lsb_release=$(cat /tmp/m/etc/lsb-release)
+  info "Verifying image with release:"
+  echo ${lsb_release}
+
+  "${SCRIPTS_DIR}/mount_gpt_image.sh" --unmount
+
+  remote_sh "cat /etc/lsb-release"
+  info "Remote image reports:"
+  echo ${REMOTE_OUT}
+
+  if [ "${lsb_release}" = "${REMOTE_OUT}" ]; then
+    info "Update was successful and image verified as ${lsb_release}."
+    return 0
+  else
+    warn "Image verification failed."
+    return 1
+  fi
+}
+
 function main() {
   assert_outside_chroot
 
   cd $(dirname "$0")
 
   FLAGS "$@" || exit 1
   eval set -- "${FLAGS_ARGV}"
 
   set -e
 
+  if [ ${FLAGS_verify} -eq ${FLAGS_TRUE} ] && \
+      [ -n "${FLAGS_update_url}" ]; then
+    warn "Verify is not compatible with setting an update url."
+    FLAGS_verify=${FLAGS_FALSE}
+  fi
+
   trap cleanup EXIT
 
   TMP=$(mktemp -d /tmp/image_to_live.XXXX)
 
   remote_access_init
 
   if [ "$(get_update_var CURRENT_OP)" != "${UPDATER_IDLE}" ]; then
     warn "Machine is in a bad state.  Rebooting it now."
     remote_reboot
   fi
 
   if [ -z "${FLAGS_update_url}" ]; then
     # Start local devserver if no update url specified.
     start_dev_server
   fi
 
-  if [ "${FLAGS_update}" -eq "${FLAGS_TRUE}" ] && ! run_auto_update; then
+  if [ ${FLAGS_update} -eq ${FLAGS_TRUE} ] && ! run_auto_update; then
     die "Update was not successful."
   fi
 
-  if ! run_stateful_update; then
+  if [ ${FLAGS_update_stateful} -eq ${FLAGS_TRUE} ] && \
+      ! run_stateful_update; then
     warn "Stateful update was not successful."
   fi
 
   remote_reboot
 
   if [[ ${FLAGS_update_hostkey} -eq ${FLAGS_TRUE} ]]; then
     local known_hosts="${HOME}/.ssh/known_hosts"
     cp "${known_hosts}" "${known_hosts}~"
     grep -v "^${FLAGS_remote} " "${known_hosts}" > "${TMP}/new_known_hosts"
     cat "${TMP}/new_known_hosts" "${TMP_KNOWN_HOSTS}" > "${known_hosts}"
     chmod 0640 "${known_hosts}"
     info "New updated in ${known_hosts}, backup made."
   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"
+  if [ ${FLAGS_verify} -eq ${FLAGS_TRUE} ]; then
+    verify_image
+  else
+    local release_description=$(echo ${REMOTE_OUT} | cut -d '=' -f 2)
+    info "Update was successful and rebooted to $release_description"
+  fi
 
-  return 0
+  exit 0
 }
 
 main $@