Refine image_to_live script to log all output from devserver.

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."
 
 function kill_all_devservers {
   # Using ! here to avoid exiting with set -e is insufficient, so use
   # || true instead.
   pkill -fx ".*devserver\.py" || true
 }
 
 function cleanup {
   echo "Killing dev server."
   kill_all_devservers
   rm -rf "${TMP}"
 }
 
 function remote_reboot_sh {
   rm -f "${TMP_KNOWN_HOSTS}"
   remote_sh "$@"
 }
 
 function start_dev_server {
   kill_all_devservers
-  ./enter_chroot.sh "./start_devserver > /dev/null 2>&1" &
+  if [ ${FLAGS_verbose} -eq ${FLAGS_FALSE} ]; then
+    ./enter_chroot.sh "./start_devserver > /dev/null 2>&1" &
+  else
+    ./enter_chroot.sh "./start_devserver" &
+  fi
   echo -n "Waiting on devserver to start"
   until netstat -anp 2>&1 | grep 8080 > /dev/null; do
     sleep .5
     echo -n "."
   done
   echo ""
 }
 
 function prepare_update_metadata {
   remote_sh "mount -norw,remount /"
@@ skipping 110 matching lines @@
     remote_reboot
     exit 1
   fi
 
   start_dev_server
 
   prepare_update_metadata
 
   if ! run_auto_update; then
     echo "Update was not successful."
-    exit
+    exit 1
   fi
 
   remote_reboot
 
   if [[ ${FLAGS_update_hostkey} -eq ${FLAGS_TRUE} ]]; then
     local known_hosts="${HOME}/.ssh/known_hosts"
     cp "${known_hosts}" "${known_hosts}~"
     grep -v "^${FLAGS_remote} " "${known_hosts}" > "${TMP}/new_known_hosts"
     cat "${TMP}/new_known_hosts" "${TMP_KNOWN_HOSTS}" > "${known_hosts}"
     chmod 0640 "${known_hosts}"
     echo "New updated in ${known_hosts}, backup made."
   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 $@