Allow factory install shim to be overlay installed

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"
 
 # Load functions and constants for chromeos-install
 . "$(dirname "$0")/chromeos-common.sh"
 
 get_default_board
 
 DEFINE_string board "$DEFAULT_BOARD" "Board for which the image was built"
 DEFINE_string qualdb "/tmp/run_remote_tests.*" \
     "Location of qualified component file"
 DEFINE_string image "" "Location of the rootfs raw image file"
 DEFINE_boolean factory $FLAGS_FALSE "Modify the image for manufacturing testing"
+DEFINE_boolean factory_install $FLAGS_FALSE \
+    "Modify the image for factory install shim"
 DEFINE_boolean yes $FLAGS_FALSE "Answer yes to all prompts" "y"
 
 # Parse command line
 FLAGS "$@" || exit 1
 eval set -- "${FLAGS_ARGV}"
 
 # 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"
@@ skipping 33 matching lines @@
   sudo losetup -d "$1"
 }
 
 cleanup() {
   # Disable die on error.
   set +e
 
   cleanup_mounts "${ROOT_FS_DIR}"
   if [ -n "${ROOT_LOOP_DEV}" ]
   then
+    sudo umount "${ROOT_FS_DIR}/var"
     cleanup_loop "${ROOT_LOOP_DEV}"
   fi
   rmdir "${ROOT_FS_DIR}"
 
   cleanup_mounts "${STATEFUL_DIR}"
   if [ -n "${STATEFUL_LOOP_DEV}" ]
   then
     cleanup_loop "${STATEFUL_LOOP_DEV}"
   fi
   rmdir "${STATEFUL_DIR}"
@@ skipping 41 matching lines @@
 # The stateful partition should be partition 1 on the disk image.
 offset=$(partoffset "${FLAGS_image}" 1)
 
 STATEFUL_LOOP_DEV=$(sudo losetup -f)
 if [ -z "$STATEFUL_LOOP_DEV" ]; then
   echo "No free loop device"
   exit 1
 fi
 sudo losetup -o $(( $offset * 512 )) "${STATEFUL_LOOP_DEV}" "${FLAGS_image}"
 sudo mount "${STATEFUL_LOOP_DEV}" "${STATEFUL_DIR}"
+sudo mount --bind "${STATEFUL_DIR}/var" "${ROOT_FS_DIR}/var"
 STATEFUL_DIR="${STATEFUL_DIR}"
 
 MOD_TEST_ROOT="${GCLIENT_ROOT}/src/scripts/mod_for_test_scripts"
 # Run test setup script to modify the image
 sudo GCLIENT_ROOT="${GCLIENT_ROOT}" ROOT_FS_DIR="${ROOT_FS_DIR}" \
     "${MOD_TEST_ROOT}/test_setup.sh"
 
 if [ ${FLAGS_factory} -eq ${FLAGS_TRUE} ]; then
   MOD_FACTORY_ROOT="${GCLIENT_ROOT}/src/scripts/mod_for_factory_scripts"
   # Run factory setup script to modify the image
   sudo GCLIENT_ROOT="${GCLIENT_ROOT}" ROOT_FS_DIR="${ROOT_FS_DIR}" \
       STATEFUL_DIR="${STATEFUL_DIR}/dev_image" QUALDB="${FLAGS_qualdb}" \
       "${MOD_FACTORY_ROOT}/factory_setup.sh"
 fi
 
+if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ]; then
+  # Run factory setup script to modify the image.
+  sudo emerge-${FLAGS_board} --root=$ROOT_FS_DIR --usepkgonly \
+      --root-deps=rdeps chromeos-factoryinstall
+
+  # Set factory server if necessary.
+  if [ "${FACTORY_SERVER}" != "" ]; then 
+    sudo sed -i \
+      "s/CHROMEOS_AUSERVER=.*$/CHROMEOS_AUSERVER=\
+http:\/\/${FACTORY_SERVER}:8080\/update/" \
+      ${ROOT_FS_DIR}/etc/lsb-release
+  fi
+fi
+
 cleanup
 trap - EXIT