Changes to use default board when set by setup_board

src/scripts/mod_image_for_test.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 modify a keyfob-based chromeos system image for testability.
 
 # 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"
 
-DEFAULT_BOARD=x86-generic
-IMAGES_DIR="${DEFAULT_BUILD_ROOT}/images/${DEFAULT_BOARD}"
-DEFAULT_IMAGE="${IMAGES_DIR}/$(ls -t $IMAGES_DIR 2>&-| head -1)/rootfs.image"
+get_default_board
 
 DEFINE_string board "$DEFAULT_BOARD" "Board for which the image was built"
-DEFINE_string image "$DEFAULT_IMAGE"    \
-  "Location of the rootfs raw image file"
+DEFINE_string image "" "Location of the rootfs raw image file"
 DEFINE_boolean yes $FLAGS_FALSE "Answer yes to all prompts" "y"
 
 # Parse command line
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
-IMAGES_DIR="${DEFAULT_BUILD_ROOT}/images/${DEFAULT_BOARD}"
-DEFAULT_IMAGE="${IMAGES_DIR}/$(ls -t $IMAGES_DIR 2>&-| head -1)/rootfs.image"
+# No board, no default and no image set then we can't find the image
+if [ -z $FLAGS_IMAGE ] && [ -z $FLAGS_board ] ; then 
+  setup_board_warning
+  echo "*** mod_image_for_test failed.  No board set and no image set"
+  exit 1
+fi
+
+# We have a board name but no image set.  Use image at default location
+if [ -z $FLAGS_image ] ; then
+  IMAGES_DIR="${DEFAULT_BUILD_ROOT}/images/${FLAGS_board}"
+  FLAGS_image="${IMAGES_DIR}/$(ls -t $IMAGES_DIR 2>&-| head -1)/rootfs.image"
+fi
+
+# Abort early if we can't find the image
+if [ ! -f $FLAGS_image ] ; then
+  echo "No image found at $FLAGS_image"
+  exit 1
+fi
 
 # Make sure anything mounted in the rootfs is cleaned up ok on exit.
 cleanup_rootfs_mounts() {
   # Occasionally there are some daemons left hanging around that have our
   # root image file system open. We do a best effort attempt to kill them.
   PIDS=`sudo lsof -t "${ROOT_FS_DIR}" | sort | uniq`
   for pid in ${PIDS}
   do
     local cmdline=`cat /proc/$pid/cmdline`
     echo "Killing process that has open file on our rootfs: $cmdline"
@@ skipping 50 matching lines @@
 
 # Run test setup script inside chroot jail to modify the image
 sudo chroot "${ROOT_FS_DIR}" "/modify_scripts/test_setup.sh"
 
 sudo umount "${ROOT_FS_DIR}/modify_scripts"
 sudo rmdir "${ROOT_FS_DIR}/modify_scripts"
 
 cleanup
 trap - EXIT