Change update logic to be backwards compatible with old format.

stateful_update

 #!/bin/sh
 
 # Copyright (c) 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.
 
 # This scripts performs update of stateful partition directories useful for
 # dev_mode.
 
 . /usr/lib/shflags
@@ skipping 10 matching lines @@
 # Die on error.
 set -e
 
 remove_quotes() {
   echo "$1" | sed -e "s/^'//; s/'$//"
 }
 
 update_dev_image () {
   LSB_RELEASE="/etc/lsb-release"
   STATEFUL_DIR="/mnt/stateful_partition"
-  WORK_DIR="${STATEFUL_DIR}/stateful_update"
 
   if [ -n "${FLAGS_ARGV}" ]; then
     BASE_UPDATE_URL=$(remove_quotes "${FLAGS_ARGV}")
   else
     if [ -f "${STATEFUL_DIR}${LSB_RELEASE}" ]; then
       DEVSERVER_URL=$(grep CHROMEOS_DEVSERVER ${STATEFUL_DIR}${LSB_RELEASE} | \
                     cut -f 2 -d '=')
     fi
     if [ -z "${DEVSERVER_URL}" ]; then
       DEVSERVER_URL=$(grep CHROMEOS_DEVSERVER ${LSB_RELEASE} | cut -f 2 -d '=')
     fi
     # Sanity check.
     if [ -z "${DEVSERVER_URL}" ]; then
       echo >&2 "No CHROMEOS_DEVSERVER URL found in lsb-release file"
       exit 1
     fi
     # Devserver URL should never contain "/update"
     DEVSERVER_URL=$(echo ${DEVSERVER_URL} | sed -e 's#/update##')
     BASE_UPDATE_URL="${DEVSERVER_URL}/static"
   fi
 
   STATEFUL_UPDATE_URL="${BASE_UPDATE_URL}/stateful.tgz"
-
-  # Prepare directories for update.
-  rm -rf "${WORK_DIR}"
-  mkdir "${WORK_DIR}"
-
-  echo "Download stateful image from ${STATEFUL_UPDATE_URL}"
-  # Unzip mount and copy the relevant directories.
-  # Get the update.
+  echo "Downloading stateful payload from ${STATEFUL_UPDATE_URL}"
+  # Download and unzip directories onto the stateful partition.
   eval "wget -qS -T 300 -O - \"${STATEFUL_UPDATE_URL}\"" | \
-      tar -C ${WORK_DIR} -xz
+      tar --overwrite --directory=${STATEFUL_DIR} -xz
   echo >&2 "Successfully downloaded update"
 
-  if [ -d "${WORK_DIR}/var" ] && [ -d "${WORK_DIR}/dev_image" ] ; then
+  if [ -d "${STATEFUL_DIR}/var_new" ] && [ -d "${STATEFUL_DIR}/dev_image_new" ]
+  then
     echo >&2 "Notifying startup that an update is available"
     touch "${STATEFUL_DIR}/.update_available"
   else
     echo >&2 "No update available"
   fi
 }
 
 update_old_state () {
   echo >&2 "Performing standard stateful update."
 }
 
 update_clean_state () {
   echo >&2 "Restoring state to factory_install with dev_image."
   echo "fast test" > "/mnt/stateful_partition/factory_install_reset"
 }
 
 main () {
   update_dev_image
   if [ "${FLAGS_stateful_change}" = "${OLD_STATE}" ]; then
     update_old_state
   elif [ "${FLAGS_stateful_change}" = "${CLEAN_STATE}" ]; then
     update_clean_state
   else
     echo >&2 "Invalid state given to stateful update.  Aborting..."
     exit 1
   fi
 }
 
 main $@