image_to_live verifies root_dev changed

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 311 matching lines @@
 
   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 find_root_dev {
+  remote_sh "rootdev -s"
+  echo ${REMOTE_OUT}
+}
+
 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
 
+  INITIAL_ROOT_DEV=$(find_root_dev)

[sosa, 2010/12/21 03:25:09]

use a local ... local initial_root_dev=

[dgarrett, 2010/12/21 03:50:41]

Done.

+
   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
     warn "Dumping update_engine.log for debugging and/or bug reporting."
     tail -n 200 "${FLAGS_update_log}" >&2
     die "Update was not successful."
   fi
@@ skipping 15 matching lines @@
   fi
 
   remote_sh "grep ^CHROMEOS_RELEASE_DESCRIPTION= /etc/lsb-release"
   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
 
+  if [ ${INITIAL_ROOT_DEV} -eq $(find_root_dev) ]; then

[sosa, 2010/12/21 03:25:09]

Put this under verify image flag above ... only if verify (which is true by
default) than verify we switched

[dgarrett, 2010/12/21 03:50:41]

Done.

+    # At this point, the software version didn't change, but we didn't
+    # switch partitions either. Means it was an update to the same version
+    # that failed.
+    warn "The root partition did NOT change. The update failed."

[sosa, 2010/12/21 03:25:09]

use die rather than warn + return 1 -> error message looks good!

[dgarrett, 2010/12/21 03:50:41]

I was following the pattern from verify_image, but Done.

+    return 1
+  fi
+
   print_time_elapsed
 
   exit 0
 }
 
 main $@