Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(80)

Unified Diff: src/scripts/image_to_live.sh

Issue 1967002: Adjust image_to_live's devserver flags to work around lab network port restrictions. (Closed) Base URL: ssh://git@chromiumos-git//chromeos
Patch Set: fix killall_devserver Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/platform/dev/devserver.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/scripts/image_to_live.sh
diff --git a/src/scripts/image_to_live.sh b/src/scripts/image_to_live.sh
index d12aad85fb5c074caa443d10a9e579002bf4c26d..48d5af8edeebfcdd38474713af394a791edcfbe7 100755
--- a/src/scripts/image_to_live.sh
+++ b/src/scripts/image_to_live.sh
@@ -20,11 +20,13 @@ 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 {
@@ -42,12 +44,13 @@ function remote_reboot_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
@@ -78,14 +81,15 @@ function prepare_update_metadata {
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
}
« no previous file with comments | « src/platform/dev/devserver.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698