Move check for image until we actually need it.

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.
 
 # --- BEGIN COMMON.SH BOILERPLATE ---
 # Load common CrOS utilities.  Inside the chroot this file is installed in
@@ skipping 69 matching lines @@
 # 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}"
   FILENAME="${CHROMEOS_IMAGE_NAME}"
   FLAGS_image="${IMAGES_DIR}/$(ls -t $IMAGES_DIR 2>&-| head -1)/${FILENAME}"
 fi
 
 # Turn path into an absolute path.
 FLAGS_image=`eval readlink -f ${FLAGS_image}`
 
-# Abort early if we can't find the image
-if [ ! -f $FLAGS_image ] ; then
-  echo "No image found at $FLAGS_image"
-  exit 1
-fi
-
 # What cross-build are we targeting?
 . "${FLAGS_build_root}/${FLAGS_board}/etc/make.conf.board_setup"
 # Figure out ARCH from the given toolchain.
 # TODO: Move to common.sh as a function after scripts are switched over.
 TC_ARCH=$(echo "${CHOST}" | awk -F'-' '{ print $1 }')
 case "${TC_ARCH}" in
   arm*)
     ARCH="arm"
     ;;
   *86)
@@ skipping 101 matching lines @@
   read -p "Modifying image ${FLAGS_image} for test; are you sure (y/N)? " SURE
   SURE="${SURE:0:1}" # Get just the first character
   if [ "$SURE" != "y" ]; then
     echo "Ok, better safe than sorry."
     exit 1
   fi
 else
   echo "Modifying image ${FLAGS_image} for test..."
 fi
 
+# Abort early if we can't find the image
+if [ ! -f $FLAGS_image ] && [ ${FLAGS_inplace} -eq ${FLAGS_TRUE} ; then
+  echo "No image found at $FLAGS_image to modify"

[petkov, 2011/02/17 20:00:41]

die

+  exit 1
+fi
+
 set -e
 
 IMAGE_DIR=$(dirname "$FLAGS_image")
 IMAGE_NAME="$(basename "$FLAGS_image")"
 ROOT_FS_DIR="$IMAGE_DIR/rootfs"
 STATEFUL_DIR="$IMAGE_DIR/stateful_partition"
 
 trap cleanup EXIT
 
 # Mounts gpt image and sets up var, /usr/local and symlinks.
@@ skipping 47 matching lines @@
 cleanup
 
 # Now make it bootable with the flags from build_image
 "${SCRIPTS_DIR}/bin/cros_make_image_bootable" "$(dirname "${FLAGS_image}")" \
                                             $(basename "${FLAGS_image}")
 
 print_time_elapsed
 
 trap - EXIT