Adjust image_to_live's devserver flags to work around lab network port restrictions.

src/scripts/image_to_live.sh

 #!/bin/bash
 
 # Copyright (c) 2009 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.
 
 . "$(dirname $0)/common.sh"
 . "$(dirname $0)/remote_access.sh"
 
 DEFINE_boolean ignore_version ${FLAGS_TRUE} \
   "Ignore existing version on running instance and always update"
 DEFINE_boolean ignore_hostname ${FLAGS_TRUE} \
   "Ignore existing AU hostname on running instance use this hostname"
 DEFINE_boolean update_known_hosts ${FLAGS_FALSE} \
   "Update your known_hosts with the new remote instance's key"
 DEFINE_boolean verbose ${FLAGS_FALSE} \
   "Whether to output verbose information for debugging."
+DEFINE_integer devserver_port 8080 \
+  "Port to use for devserver"
 
 function kill_all_devservers {
   # Using ! here to avoid exiting with set -e is insufficient, so use
   # || true instead.
-  pkill -fx ".*devserver\.py" || true
+  sudo pkill -f devserver\.py || true
 }
 
 function cleanup {
   echo "Killing dev server."
   kill_all_devservers
   cleanup_remote_access
   rm -rf "${TMP}"
 }
 
 function remote_reboot_sh {
   rm -f "${TMP_KNOWN_HOSTS}"
   remote_sh "$@"
 }
 
 function start_dev_server {
   kill_all_devservers
   if [ ${FLAGS_verbose} -eq ${FLAGS_FALSE} ]; then
-    ./enter_chroot.sh "./start_devserver > dev_server.log 2>&1" &
+    ./enter_chroot.sh "sudo ./start_devserver ${FLAGS_devserver_port} \
+         > dev_server.log 2>&1" &
   else
-    ./enter_chroot.sh "./start_devserver" &
+    ./enter_chroot.sh "sudo ./start_devserver ${FLAGS_devserver_port}" &
   fi
   echo -n "Waiting on devserver to start"
-  until netstat -anp 2>&1 | grep 8080 > /dev/null; do
+  until netstat -anp 2>&1 | grep ${FLAGS_devserver_port} > /dev/null; do
     sleep .5
     echo -n "."
   done
   echo ""
 }
 
 # Copys stateful update script which fetches the newest stateful update
 # from the dev server and prepares the update. chromeos_startup finishes
 # the update on next boot.
 function copy_stateful_update {
@@ skipping 10 matching lines @@
 
   if [[ ${FLAGS_ignore_version} -eq ${FLAGS_TRUE} ]]; then
     echo "Forcing update independent of the current version"
     remote_sh "cat /etc/lsb-release |\
         grep -v CHROMEOS_RELEASE_VERSION > /etc/lsb-release~;\
         mv /etc/lsb-release~ /etc/lsb-release; \
         echo 'CHROMEOS_RELEASE_VERSION=0.0.0.0' >> /etc/lsb-release"
   fi
 
   if [ ${FLAGS_ignore_hostname} -eq ${FLAGS_TRUE} ]; then
-    echo "Forcing update from ${HOSTNAME}"
+    devserver_url="http://$HOSTNAME:${FLAGS_devserver_port}"
+    echo "Forcing update from ${devserver_url}"
     remote_sh "cat /etc/lsb-release |\
         grep -v '^CHROMEOS_AUSERVER=' |\
         grep -v '^CHROMEOS_DEVSERVER=' > /etc/lsb-release~;\
         mv /etc/lsb-release~ /etc/lsb-release; \
-        echo 'CHROMEOS_AUSERVER=http://$HOSTNAME:8080/update' >> \
+        echo 'CHROMEOS_AUSERVER=${devserver_url}/update' >> \
           /etc/lsb-release; \
-        echo 'CHROMEOS_DEVSERVER=http://$HOSTNAME:8080' >> /etc/lsb-release"
+        echo 'CHROMEOS_DEVSERVER=${devserver_url}' >> /etc/lsb-release"
   fi
 }
 
 function run_auto_update {
   echo "Starting update"
   local update_file=/var/log/softwareupdate.log
   # Clear it out so we don't see a prior run and make sure it
   # exists so the first tail below can't fail if it races the
   # memento updater first write and wins.
   remote_sh "rm -f ${update_file}; touch ${update_file}; \
@@ skipping 108 matching lines @@
   fi
 
   remote_sh "grep ^CHROMEOS_RELEASE_DESCRIPTION= /etc/lsb-release"
   local release_description=$(echo $REMOTE_OUT | cut -d '=' -f 2)
   echo "Update was successful and rebooted to $release_description"
 
   return 0
 }
 
 main $@