Update factory installer, factory test

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}
+  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}
 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"
-fi
-AUTOTEST_SRC="${SYSROOT}/usr/local/autotest"
-
 # Die on any errors.
 set -e
 
 # No board, no default and no image set then we can't find the image
 if [ -z ${FLAGS_from} ] && [ -z ${FLAGS_board} ] ; then
   setup_board_warning
   exit 1
 fi
 
 # We have a board name but no image set.  Use image at default location
@@ skipping 26 matching lines @@
 function do_cleanup {
   echo "Cleaning loopback devices: ${STATEFUL_LOOP_DEV}"
   if [ "${STATEFUL_LOOP_DEV}" != "" ]; then
     sudo umount "${STATEFUL_DIR}"
     sudo losetup -d "${STATEFUL_LOOP_DEV}"
     rmdir "${STATEFUL_DIR}"
     echo "Cleaned"
   fi
 }
 
-if [ ${FLAGS_install_autotest} -eq ${FLAGS_TRUE} ] ; then
-  echo "Detecting autotest at ${AUTOTEST_SRC}"
-  if [ -d ${AUTOTEST_SRC} ]
-  then
-    # Figure out how to loop mount the stateful partition. It's always
-    # partition 1 on the disk image.
-    offset=$(partoffset "${SRC_IMAGE}" 1)
-
-    stateful_loop_dev=$(sudo losetup -f)
-    if [ -z "${stateful_loop_dev}" ]
-    then
-      echo "No free loop device. Free up a loop device or reboot. exiting."
-      exit 1
-    fi
-    STATEFUL_LOOP_DEV=$stateful_loop_dev
-    trap do_cleanup INT TERM EXIT
-
-    echo "Mounting ${STATEFUL_DIR} loopback"
-    sudo losetup -o $(( $offset * 512 )) "${stateful_loop_dev}" "${SRC_IMAGE}"
-    sudo mount "${stateful_loop_dev}" "${STATEFUL_DIR}"
-    stateful_root="${STATEFUL_DIR}/dev_image"
-
-    echo "Install autotest into stateful partition..."
-    autotest_client="/home/autotest-client"
-    sudo mkdir -p "${stateful_root}${autotest_client}"
-    sudo ln -sf /mnt/stateful_partition/dev_image${autotest_client} \
-      ${stateful_root}/autotest
-
-    sudo cp -fpru ${AUTOTEST_SRC}/client/* \
-      "${stateful_root}/${autotest_client}"
-    sudo chmod 755 "${stateful_root}/${autotest_client}"
-    sudo chown -R 1000:1000 "${stateful_root}/${autotest_client}"
-
-    sudo umount ${STATEFUL_DIR}
-    sudo losetup -d "${stateful_loop_dev}"
-    trap - INT TERM EXIT
-    rmdir "${STATEFUL_DIR}"
-  else
-    echo "/usr/local/autotest under ${DEFAULT_CHROOT_DIR} is not installed."
-    echo "Please call build_autotest.sh inside chroot first."
-    exit -1
-  fi
-fi
-
 
 # If we're asked to modify the image for test, then let's make a copy and
 # 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"
 
@@ skipping 80 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