Add delta update support to imaging tools.

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 16 matching lines @@
   "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_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."
 
 # 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"
@@ skipping 30 matching lines @@
 function get_hostname {
   local hostname
   # Try to parse ifconfig for ip address
   hostname=$(ifconfig eth0 \
       | grep 'inet addr' \
       | sed 's/.\+inet addr:\(\S\+\).\+/\1/') || hostname=${HOSTNAME}
   echo ${hostname}
 }
 
 # Reinterprets path from outside the chroot for use inside.
+# Returns "" if "" given.
 # $1 - The path to reinterpret.
 function reinterpret_path_for_chroot() {
-  local path_abs_path=$(readlink -f "${1}")
-  local gclient_root_abs_path=$(readlink -f "${GCLIENT_ROOT}")
+  if [ -z "${1}" ]; then
+    echo ""
+  else
+    local path_abs_path=$(readlink -f "${1}")
+    local gclient_root_abs_path=$(readlink -f "${GCLIENT_ROOT}")
 
-  # Strip the repository root from the path.
-  local relative_path=$(echo ${path_abs_path} \
-      | sed s:${gclient_root_abs_path}/::)
+    # Strip the repository root from the path.
+    local relative_path=$(echo ${path_abs_path} \

[kmixter1, 2010/10/27 17:15:52]

I think you can do this with less work:

${path_abs_path#${gclient_root_abs_path}*}

+        | sed s:${gclient_root_abs_path}/::)
 
-  if [ "${relative_path}" = "${path_abs_path}" ]; then
-    die "Error reinterpreting path.  Path ${1} is not within your source tree."
+    if [ "${relative_path}" = "${path_abs_path}" ]; then
+      die "Error reinterpreting path.  Path ${1} is not within source tree."
+    fi
+
+    # Prepend the chroot repository path.
+    echo "/home/${USER}/trunk/${relative_path}"
   fi
-
-  # Prepend the chroot repository path.
-  echo "/home/${USER}/trunk/${relative_path}"
 }
 
 function start_dev_server {
   kill_all_devservers
   local devserver_flags=
   # 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"
   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"
   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" &
 
   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
     echo -n "."
@@ skipping 238 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 $@