Changes to use default board when set by setup_board

src/scripts/image_to_usb.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 convert the output of build_image.sh to a usb image.
 
 # 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"
 
+get_default_board
 
 # Flags
-DEFINE_string board "" "Board for which the image was built"
+DEFINE_string board "$DEFAULT_BOARD" "Board for which the image was built"
 DEFINE_string from "" \
   "Directory containing rootfs.image and mbr.image"
 DEFINE_string to "" "$DEFAULT_TO_HELP"
 DEFINE_boolean yes $FLAGS_FALSE "Answer yes to all prompts" "y"
 DEFINE_boolean install_autotest $FLAGS_FALSE \
   "Whether to install autotest to the stateful partition."
 DEFINE_boolean copy_kernel $FLAGS_FALSE \
   "Copy the kernel to the fourth partition."
 
 # Parse command line
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
 # Inside the chroot, so output to usb.img in the same dir as the other
 # Script can be run either inside or outside the chroot.
 if [ $INSIDE_CHROOT -eq 1 ]
 then
   AUTOTEST_SRC="/usr/local/autotest/${FLAGS_board}"
 else
   AUTOTEST_SRC="${DEFAULT_CHROOT_DIR}/usr/local/autotest/${FLAGS_board}"
 fi
 
 # Die on any errors.
 set -e
 
-# If from isn't explicitly set
+# No board, no default and no image set then we can't find the image
+if [ -z $FLAGS_from ] && [ -z $FLAGS_board ] ; then 
+  setup_board_warning
+  exit 1
+fi
+
+# We have a board name but no image set.  Use image at default location
 if [ -z "$FLAGS_from" ]; then
   IMAGES_DIR="${DEFAULT_BUILD_ROOT}/images/${FLAGS_board}"
   FLAGS_from="${IMAGES_DIR}/$(ls -t $IMAGES_DIR 2>&-| head -1)"
 fi
 
+if [ ! -d "$FLAGS_from" ] ; then
+  echo "Cannot find image directory $FLAGS_from"
+  exit 1
+fi
+
 # If to isn't explicitly set
 if [ -z "$FLAGS_to" ]; then
   # Script can be run either inside or outside the chroot.
   if [ $INSIDE_CHROOT -eq 1 ]
   then
     # Inside the chroot, so output to usb.img in the same dir as the other
     # images.
     FLAGS_to="${FLAGS_from}/usb.img"
   else
     # Outside the chroot, so output to the default device for a usb key.
@@ skipping 149 matching lines @@
   echo "Done.  To copy to USB keyfob, outside the chroot, do something like:"
   echo "   sudo dd if=${FLAGS_to} of=/dev/sdb bs=4M"
   echo "where /dev/sdb is the entire keyfob."
   if [ $INSIDE_CHROOT -eq 1 ]
   then
     echo "NOTE: Since you are currently inside the chroot, and you'll need to"
     echo "run dd outside the chroot, the path to the USB image will be"
     echo "different (ex: ~/chromeos/trunk/src/build/images/SOME_DIR/usb.img)."
   fi
 fi