Create a transparent proxy for test programs to use, with the

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 20 matching lines @@
 DEFINE_string archive_dir "" \
   "Update using the test image in the image.zip in this directory." a
 DEFINE_string board "" "Override the board reported by the target"
 DEFINE_integer devserver_port 8080 \
   "Port to use for devserver."
 DEFINE_boolean for_vm ${FLAGS_FALSE} "Image is for a vm."
 DEFINE_string image "" \
   "Update with this image path that is in this source checkout." i
 DEFINE_string payload "" \
   "Update with this update payload, ignoring specified images."
+DEFINE_string proxy_port "" \
+  "Have the client request from this porxy instead of devserver."

[sosa, 2010/12/07 03:44:36]

porxies are delicious

[dgarrett, 2010/12/07 04:08:51]

Done.

 DEFINE_string src_image "" \
   "Create a delta update by passing in the image on the remote machine."
 DEFINE_boolean update_stateful ${FLAGS_TRUE} \
   "Perform update of stateful partition e.g. /var /usr/local."
 DEFINE_string update_url "" "Full url of an update image."
 
 # Flags for stateful update.
 DEFINE_string stateful_update_flag "" \
   "Flag to pass to stateful update e.g. old, clean, etc." s
 
@@ skipping 81 matching lines @@
     IMAGE_PATH="${IMAGE_PATH}/chromiumos_image.bin"
     devserver_flags="${devserver_flags} \
         --image $(reinterpret_path_for_chroot ${IMAGE_PATH})"
   fi
 
   if [ -n "${FLAGS_payload}" ]; then
     devserver_flags="${devserver_flags} \
         --payload $(reinterpret_path_for_chroot ${FLAGS_payload})"
   fi
 
+  if [ -n "${FLAGS_proxy_port}" ]; then
+    devserver_flags="${devserver_flags} \
+        --proxy_port ${FLAGS_proxy_port}"
+  fi
+
   [ ${FLAGS_for_vm} -eq ${FLAGS_TRUE} ] && \
       devserver_flags="${devserver_flags} --for_vm"
 
   devserver_flags="${devserver_flags} \
       --src_image=\"$(reinterpret_path_for_chroot ${FLAGS_src_image})\""
 
   info "Starting devserver with flags ${devserver_flags}"
   ./enter_chroot.sh "sudo ./start_devserver ${devserver_flags} \
        --client_prefix=ChromeOSUpdateEngine \
        --board=${FLAGS_board} \
@@ skipping 50 matching lines @@
   if [[ ${FLAGS_ignore_version} -eq ${FLAGS_TRUE} ]]; then
     info "Forcing update independent of the current version"
     update_args="--update ${update_args}"
   fi
 
   echo "${update_args}"
 }
 
 function get_devserver_url {
   local devserver_url=""
+  local port=${FLAGS_devserver_port}
+  
+  if [[ -n ${FLAGS_proxy_port} ]]; then

[sosa, 2010/12/07 03:44:36]

no need for double []

[dgarrett, 2010/12/07 04:08:51]

I had weird behavior in testing that was fixed by using the doubles, but I
couldn't figure out why. I agree that it shouldn't be needed.

+    port=${FLAGS_proxy_port}
+  fi
+  
   if [ ${FLAGS_ignore_hostname} -eq ${FLAGS_TRUE} ]; then
     if [ -z ${FLAGS_update_url} ]; then
-      devserver_url="http://$(get_hostname):${FLAGS_devserver_port}/update"
+      devserver_url="http://$(get_hostname):${port}/update"
     else
       devserver_url="${FLAGS_update_url}"
     fi
   fi
   echo "${devserver_url}"
 }
 
 function truncate_update_log {
   remote_sh "> /var/log/update_engine.log"
 }
@@ skipping 152 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 $@