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

Unified Diff: src/scripts/image_to_live.sh

Issue 666002: minor fix to image_to_live.sh. (Closed)
Patch Set: patch 4 Created 10 years, 10 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 | « no previous file | 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 4930d971af0f0e16f783edf02bffb840d7202139..33574206634f229083ba52cdcaee8516d2673154 100755
--- a/src/scripts/image_to_live.sh
+++ b/src/scripts/image_to_live.sh
@@ -22,10 +22,11 @@ DEFINE_boolean update_known_hosts ${FLAGS_FALSE} \
function kill_all_devservers {
# Using ! here to avoid exiting with set -e is insufficient, so use
# || true instead.
- pkill -f 'python devserver.py' || true
+ pkill -fx ".*devserver\.py" || true
}
function cleanup {
+ echo "Killing dev server."
kill_all_devservers
rm -rf "${TMP}"
}
@@ -37,7 +38,6 @@ function remote_reboot_sh {
function start_dev_server {
kill_all_devservers
- sudo -v
./enter_chroot.sh "cd ../platform/dev; ./start-devserver.sh>/dev/null 2>&1" &
echo -n "Waiting on devserver to start"
until netstat -anp 2>&1 | grep 8080 > /dev/null; do
@@ -111,7 +111,7 @@ function run_auto_update {
# Sleep for a while so that ssh handling doesn't slow down the install
sleep 2
done
-
+
return ${update_error}
}
@@ -123,7 +123,7 @@ function remote_reboot {
while true; do
REMOTE_OUT=""
- # This may fail while the machine is done so generate output and a
+ # This may fail while the machine is down so generate output and a
# boolean result to distinguish between down/timeout and real failure
! remote_sh_allow_changed_host_key \
"echo 0; [ -e /tmp/awaiting_reboot ] && echo '1'; true"
@@ -186,7 +186,7 @@ function main() {
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
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698