commit 120ceab220fdc2b884f2e966f0f71b9ed7c85df1
author Yu-Ju Hong <yjhong@chromium.org> Mon Dec 09 22:47:52 2013 -0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Dec 12 02:25:02 2013 +0000
tree 67959b879d86100fc453129f876fddf11d162cda
parent 4057dd5adaf1249c1d08bcaf95b5f0944f92ff89

stateful_update: support retrieving payloads locally

Currently, stateful_update either accepts a URL to download the
payload (stateful.tgz) or reads the devserver URL from
/etc/lsb-release. This CL allows stateful_update to accept a local
payload path. This enable reading the payload directly from stdin with
a '-' path, so that we can pipe the payload through an SSH connection.

BUG=chromium:327588
TEST=stateful updates on a local peppy

Change-Id: Ife7b8c4ce0b667ccbbdbad9f2225ee23c1a8111a
Reviewed-on: https://chromium-review.googlesource.com/179533
Reviewed-by: Chris Sosa <sosa@chromium.org>
Commit-Queue: Yu-Ju Hong <yjhong@chromium.org>
Tested-by: Yu-Ju Hong <yjhong@chromium.org>

stateful_update

diff --git a/stateful_update b/stateful_update
index 0f5afc5..9cc87d6 100755
--- a/stateful_update
+++ b/stateful_update
@@ -41,9 +41,10 @@
 
 update_dev_image () {
   local base_update_url devserver_url
-  if [ -n "${FLAGS_ARGV}" ]; then
-    base_update_url=$(remove_quotes "${FLAGS_ARGV}")
-  else
+  local local_payload_path
+  local path=$(remove_quotes "${FLAGS_ARGV}")
+
+  if [ -z "${path}" ]; then
     if [ -f "${STATEFUL_DIR}${LSB_RELEASE}" ]; then
       devserver_url=$(grep CHROMEOS_DEVSERVER ${STATEFUL_DIR}${LSB_RELEASE} |
           cut -f 2 -d '=')
@@ -53,20 +54,33 @@
     fi
     # Sanity check.
     if [ -z "${devserver_url}" ]; then
-      echo >&2 "No CHROMEOS_DEVSERVER URL found in lsb-release file"
+      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"
+  # Determine whether the path is local.
+  elif [ -f "${path}" ] || [ "${path}" = "-" ]; then
+   local_payload_path=${path}
+  else
+   base_update_url=${path}
   fi
 
-  local stateful_update_url="${base_update_url}/stateful.tgz"
-  echo >&2 "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 --ignore-command-error --overwrite --directory=${STATEFUL_DIR} -xz
-  echo >&2 "Successfully downloaded update"
+  if [ -n "${base_update_url}" ]; then
+    local stateful_update_url="${base_update_url}/stateful.tgz"
+    echo >&2 "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 --ignore-command-error --overwrite --directory=${STATEFUL_DIR} -xz
+    echo >&2 "Successfully downloaded update."
+  else
+    echo >&2 "Reading local payload ${local_payload_path}"
+    # Set timeout to two minutes to avoid waiting on stdin indefinitely.
+    timeout 120s tar --ignore-command-error --overwrite \
+        --directory=${STATEFUL_DIR} -xzf ${local_payload_path}
+    echo >&2 "Successfully retrieved update."
+  fi
 
   if [ ! -d "${STATEFUL_DIR}/var_new" ] ||
       [ ! -d "${STATEFUL_DIR}/dev_image_new" ]; then