Fix factory_install build.

src/scripts/build_image

 #!/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 build a bootable keyfob-based chromeos system image from within
 # a chromiumos setup. This assumes that all needed packages have been built into
 # the given target's root with binary packages turned on. This script will
 # build the Chrome OS image using only pre-built binary packages.
@@ skipping 206 matching lines @@
   # Additional changes to developer image.
 
   # The ldd tool is a useful shell script but lives in glibc; just copy it.
   sudo cp -a "$(which ldd)" "${root_dev_dir}/usr/bin"
 
   # If vim is installed, then a vi symlink would probably help.
   if [[ -x "${ROOT_FS_DIR}/usr/local/bin/vim" ]]; then
     sudo ln -sf vim "${ROOT_FS_DIR}/usr/local/bin/vi"
   fi
 
-  # Check that the image has been correctly created.
-  "${SCRIPTS_DIR}/test_image" \
-    --root="$root_fs_dir" \
-    --target="$ARCH"
+  # Check that the image has been correctly created.  Only do it if not
+  # building a factory install image, as the INSTALL_MASK for it will
+  # make test_image fail.
+  if [[ $FLAGS_factory_install -eq ${FLAGS_FALSE} ]] ; then
+    "${SCRIPTS_DIR}/test_image" \
+      --root="$root_fs_dir" \
+      --target="$ARCH"
+  fi
 
   trap - EXIT
   $SCRIPTS_DIR/mount_gpt_image.sh -u -r "$root_fs_dir" -s "$stateful_dir"
   echo "Developer image built and stored at $output_img"
 }
 
 # ${DEV_IMAGE_ROOT} specifies the location of where developer packages will
 # be installed on the stateful dir.  On a Chromium OS system, this will
 # translate to /usr/local
 DEV_IMAGE_ROOT=
 
 trap "cleanup && delete_prompt" EXIT
 
 mkdir -p "$ROOT_FS_DIR"
 
 # Create and format the root file system.
 
 # Check for loop device before creating image.
 LOOP_DEV=$(sudo losetup -f)
 if [ -z "$LOOP_DEV" ] ; then
   echo "No free loop device.  Free up a loop device or reboot.  exiting. "
   exit 1
 fi
 
 # Create root file system disk image to fit on a 1GB memory stick.
 # 1 GB in hard-drive-manufacturer-speak is 10^9, not 2^30.  950MB < 10^9 bytes.
 if [[ $FLAGS_factory_install -eq ${FLAGS_TRUE} ]] ; then
-  ROOT_SIZE_BYTES=$((1024 * 1024 * 180))
+  ROOT_SIZE_BYTES=$((1024 * 1024 * 300))
 else
   ROOT_SIZE_BYTES=$((1024 * 1024 * 720))
 fi
 
 dd if=/dev/zero of="$ROOT_FS_IMG" bs=1 count=1 seek=$((ROOT_SIZE_BYTES - 1))
 sudo losetup "$LOOP_DEV" "$ROOT_FS_IMG"
 sudo mkfs.ext3 "$LOOP_DEV"
 
 # Tune and mount rootfs.
 UUID=$(uuidgen)
@@ skipping 191 matching lines @@
 echo "Done.  Image created in ${OUTPUT_DIR}"
 echo "Chromium OS image created as $PRISTINE_IMAGE_NAME"
 if [ "$FLAGS_withdev" -eq "$FLAGS_TRUE" ]; then
   echo "Developer image created as $DEVELOPER_IMAGE_NAME"
 fi
 echo "To copy to USB keyfob, OUTSIDE the chroot, do something like:"
 echo "  ./image_to_usb.sh --from=${OUTSIDE_OUTPUT_DIR} --to=/dev/sdX"
 echo "To convert to VMWare image, OUTSIDE the chroot, do something like:"
 echo "  ./image_to_vmware.sh --from=${OUTSIDE_OUTPUT_DIR}"
 echo "from the scripts directory where you entered the chroot."