Gets image_to_live to work with a custom devserver_port

image_to_live.sh

 #!/bin/bash
 
 # Copyright (c) 2009-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.
 
 # 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.
@@ skipping 71 matching lines @@
   if [ "${relative_path}" = "${path_abs_path}" ]; then
     die "Error reinterpreting path.  Path ${1} is not within your source tree."
   fi
 
   # Prepend the chroot repository path.
   echo "/home/${USER}/trunk/${relative_path}"
 }
 
 function start_dev_server {
   kill_all_devservers
-  local devserver_flags=${FLAGS_devserver_port}
+  local devserver_flags=
   # Parse devserver flags.
   if [ -n "${FLAGS_image}" ]; then
     devserver_flags="${devserver_flags} \
         --image $(reinterpret_path_for_chroot ${FLAGS_image})"
     IMAGE_PATH="${FLAGS_image}"
 
   elif [ -n "${FLAGS_archive_dir}" ]; then
     devserver_flags="${devserver_flags} \
         --archive_dir $(reinterpret_path_for_chroot ${FLAGS_archive_dir}) -t"
     IMAGE_PATH="${FLAGS_archive_dir}/chromiumos_test_image.bin"
   else
     # IMAGE_PATH should be the newest image and learn the board from
     # the target.
     FLAGS_board=""
     learn_board
     IMAGE_PATH="$($(dirname "$0")/get_latest_image.sh --board="${FLAGS_board}")"
     IMAGE_PATH="${IMAGE_PATH}/chromiumos_image.bin"
   fi
 
   info "Starting devserver with flags ${devserver_flags}"
   ./enter_chroot.sh "sudo ./start_devserver ${devserver_flags} \
-       --client_prefix=ChromeOSUpdateEngine > ${FLAGS_server_log} 2>&1" &
+       --client_prefix=ChromeOSUpdateEngine \
+       --port=${FLAGS_devserver_port} > ${FLAGS_server_log} 2>&1" &
 
   echo -n "Waiting on devserver to start"
   until netstat -anp 2>&1 | grep 0.0.0.0:${FLAGS_devserver_port} > /dev/null
   do
     sleep .5
     echo -n "."
   done
   echo ""
 }
 
@@ skipping 232 matching lines @@
     local release_description=$(echo ${REMOTE_OUT} | cut -d '=' -f 2)
     info "Update was successful and rebooted to $release_description"
   fi
 
   print_time_elapsed
 
   exit 0
 }
 
 main $@