Allow file in --from arg

image_to_usb.sh

 #!/bin/bash
 
 # Copyright (c) 2010 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.
 
 # --- BEGIN COMMON.SH BOILERPLATE ---
 # Load common CrOS utilities.  Inside the chroot this file is installed in
@@ skipping 22 matching lines @@
   INSTALLER_ROOT=$(dirname "$(readlink -f "$0")")
 
 . "${INSTALLER_ROOT}/chromeos-common.sh" || \
   die "Unable to load chromeos-common.sh"
 
 get_default_board
 
 # Flags
 DEFINE_string board "${DEFAULT_BOARD}" "Board for which the image was built"
 DEFINE_string from "" \
-  "Directory containing ${CHROMEOS_IMAGE_NAME}"
+  "Directory containing ${CHROMEOS_IMAGE_NAME}, or filename"
 DEFINE_string to "/dev/sdX" "${DEFAULT_TO_HELP}"
 DEFINE_boolean yes ${FLAGS_FALSE} "Answer yes to all prompts" "y"
 DEFINE_boolean force_copy ${FLAGS_FALSE} "Always rebuild test image"
 DEFINE_boolean force_non_usb ${FLAGS_FALSE} \
   "Write out image even if target (--to) doesn't look like a USB disk"
 DEFINE_boolean factory_install ${FLAGS_FALSE} \
   "Whether to generate a factory install shim."
 DEFINE_boolean factory ${FLAGS_FALSE} \
   "Whether to generate a factory runin image. Implies aututest and test"
 DEFINE_boolean copy_kernel ${FLAGS_FALSE} \
@@ skipping 11 matching lines @@
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
 if [ ${FLAGS_factory} -eq ${FLAGS_TRUE} ] ; then
   if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ] ; then
     echo "Factory test image is incompatible with factory install shim."
     exit 1
   fi
 fi
 
+# Allow --from /foo/file.bin
+if [ -f "${FLAGS_from}" ]; then
+  pathname=$(dirname "${FLAGS_from}")
+  filename=$(basename "${FLAGS_from}")
+  FLAGS_image_name="${filename}"
+  FLAGS_from="${pathname}"
+fi
+
+
 # Require autotest for manucaturing image.
 if [ ${FLAGS_factory} -eq ${FLAGS_TRUE} ] ; then
   echo "Factory image requires --test_image, setting."
   FLAGS_test_image=${FLAGS_TRUE}
 fi
 
 # Require test for for factory install shim.
 if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ] ; then
   echo "Factory install shim requires --test_image, setting."
   FLAGS_test_image=${FLAGS_TRUE}
@@ skipping 163 matching lines @@
   echo "Done."
 else
   # Output to a file, so just make a copy.
   echo "Copying ${SRC_IMAGE} to ${FLAGS_to}..."
   ${COMMON_PV_CAT} "${SRC_IMAGE}" >"${FLAGS_to}"
 
   echo "Done.  To copy to a USB drive, do something like:"
   echo "   sudo dd if=${FLAGS_to} of=/dev/sdX bs=4M oflag=sync"
   echo "where /dev/sdX is the entire drive."
 fi