From 3c784f78fe7f6d53161a3798de5849b23c03bddc Mon Sep 17 00:00:00 2001
From: Kelly Lucas <kdlucas@chromium.org>
Date: Mon, 17 May 2010 13:57:30 -0700
Subject: [PATCH] Only kill the dev server when it is started by image_to_live
 process.

Review URL: http://codereview.chromium.org/1986012
---
 image_to_live.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/image_to_live.sh b/image_to_live.sh
index c75e3684ac..755807507d 100755
--- a/image_to_live.sh
+++ b/image_to_live.sh
@@ -25,14 +25,16 @@ DEFINE_integer devserver_port 8080 \
 DEFINE_string update_url "" "Full url of an update image"
 
 function kill_all_devservers {
+  echo "Killing dev server."
   # Using ! here to avoid exiting with set -e is insufficient, so use
   # || true instead.
   sudo pkill -f devserver\.py || true
 }
 
 function cleanup {
-  echo "Killing dev server."
-  kill_all_devservers
+  if [ -z "${FLAGS_update_url}" ]; then
+    kill_all_devservers
+  fi
   cleanup_remote_access
   rm -rf "${TMP}"
 }