Allow factory install shim to be overlay installed

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"
 
 # Load functions and constants for chromeos-install
 . "$(dirname "$0")/chromeos-common.sh"
 
 get_default_board
 
 # Flags
 DEFINE_string board "${DEFAULT_BOARD}" "Board for which the image was built"
 DEFINE_string from "" \
   "Directory containing chromiumos_image.bin"
 DEFINE_string to "" "${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 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 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."
 DEFINE_boolean test_image "${FLAGS_FALSE}" \
   "Copies normal image to chromiumos_test_image.bin, modifies it for test."
 DEFINE_string build_root "/build" \
   "The root location for board sysroots."
 
 # Parse command line
 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
+
 # Require autotest for manucaturing image.
 if [ ${FLAGS_factory} -eq ${FLAGS_TRUE} ] ; then
   echo "Factory image requires --install_autotest and --test_image, setting."
   FLAGS_install_autotest=${FLAGS_TRUE}
   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}
+fi
+
+
 # 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
   SYSROOT="${FLAGS_build_root}/${FLAGS_board}"
 else
   SYSROOT="${DEFAULT_CHROOT_DIR}${FLAGS_build_root}/${FLAGS_board}"
   echo "Caching sudo authentication"
   sudo -v
   echo "Done"
@@ skipping 95 matching lines @@
 # modify that instead.
 if [ ${FLAGS_test_image} -eq ${FLAGS_TRUE} ] ; then
   if [ ! -f "${FLAGS_from}/chromiumos_test_image.bin" ] || \
      [ ${FLAGS_force_copy} -eq ${FLAGS_TRUE} ] ; then
     # Copy it.
     echo "Creating test image from original..."
     cp -f "${SRC_IMAGE}" "${FLAGS_from}/chromiumos_test_image.bin"
 
     # Check for manufacturing image.
     if [ ${FLAGS_factory} -eq ${FLAGS_TRUE} ] ; then
-      FACTORY_ARGS="--factory"
+      EXTRA_ARGS="--factory"
+    fi
+
+    # Check for instqall shim.
+    if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ] ; then
+      EXTRA_ARGS="--factory_install"
     fi
 
     # Modify it.  Pass --yes so that mod_image_for_test.sh won't ask us if we
     # really want to modify the image; the user gave their assent already with
     # --test-image and the original image is going to be preserved.
     "${SCRIPTS_DIR}/mod_image_for_test.sh" --image \
-      "${FLAGS_from}/chromiumos_test_image.bin" ${FACTORY_ARGS} --yes
+      "${FLAGS_from}/chromiumos_test_image.bin" ${EXTRA_ARGS} --yes
     echo "Done with mod_image_for_test."
   else
     echo "Using cached test image."
   fi
   SRC_IMAGE="${FLAGS_from}/chromiumos_test_image.bin"
   echo "Source test image is: ${SRC_IMAGE}"
 fi
 
 
 # Let's do it.
@@ skipping 48 matching lines @@
   echo "   sudo dd if=${FLAGS_to} of=/dev/sdX bs=4M"
   echo "where /dev/sdX is the entire drive."
   if [ ${INSIDE_CHROOT} -eq 1 ]
   then
     example=$(basename "${FLAGS_to}")
     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/$example)."
   fi
 fi