From 48768d87639a64f62073ec7a1028455456689913 Mon Sep 17 00:00:00 2001
From: Chris Sosa <sosa@chromium.org>
Date: Tue, 27 Apr 2010 15:48:09 -0700
Subject: [PATCH] TBR: Missed last commit for image_to_live in last push

---
 image_to_live.sh | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/image_to_live.sh b/image_to_live.sh
index 77e361fa9a..06514db1a1 100755
--- a/image_to_live.sh
+++ b/image_to_live.sh
@@ -31,7 +31,7 @@ function cleanup {
   echo "Killing dev server."
   kill_all_devservers
   cleanup_remote_access
-  . "$(dirname $0)/mount_gpt_image.sh" -mu
+  ./mount_gpt_image.sh -mu
   rm -rf "${TMP}"
 }
 
@@ -58,20 +58,21 @@ function start_dev_server {
 function copy_stateful_tarball {
   echo "Starting stateful update."
   # Mounts most recent image stateful dir to /tmp/s
-  . "$(dirname $0)/mount_gpt_image.sh" -m
+  ./mount_gpt_image.sh -m
   # Create tar files for the stateful partition.
   cd /tmp/s/var && sudo tar -cf /tmp/var.tar . && cd -
   cd /tmp/s/dev_image && sudo tar -cf /tmp/developer.tar . && cd -
   # Copy over tar files.
   remote_cp /tmp/var.tar /tmp
   remote_cp /tmp/developer.tar /tmp
-  remote_sh "mkdir /mnt/stateful_partition/var_new |\
-             mkdir /mnt/stateful_partition/dev_image_new |\
-             tar -xf /tmp/var.tar -C /mnt/stateful_partition/var_new |\
+  remote_sh "mkdir /mnt/stateful_partition/var_new &&\
+             mkdir /mnt/stateful_partition/dev_image_new &&\
+             tar -xf /tmp/var.tar -C /mnt/stateful_partition/var_new &&\
              tar -xf /tmp/developer.tar \
-              -C /mnt/stateful_partition/dev_image_new"
+               -C /mnt/stateful_partition/dev_image_new &&\
+             touch /mnt/stateful_partition/.update_available"
   # unmounts stateful partition
-  . "$(dirname $0)/mount_gpt_image.sh" -mu
+  ./mount_gpt_image.sh -mu
 }
 
 function prepare_update_metadata {