build_image: make sure the factory_image size is propagated

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 32 matching lines @@
 DEFINE_string to "" \
   "The target image file or device"
 DEFINE_boolean factory_install ${FLAGS_FALSE} \
   "Build a smaller image to overlay the factory install shim on; this argument \
 is also required in image_to_usb."
 DEFINE_boolean dev_install ${FLAGS_FALSE} \
   "Build a smaller image to overlay the dev recovery install shim on"
 DEFINE_string arm_extra_bootargs "" \
   "Additional command line options to pass to the ARM kernel."
 DEFINE_integer rootfs_partition_size 1024 \
-  "rootfs parition size in MBs."
+  "rootfs partition size in MiBs."
 DEFINE_integer rootfs_size 720 \
-  "rootfs filesystem size in MBs."
+  "rootfs filesystem size in MiBs."
 # ceil(0.1 * rootfs_size) is a good minimum.
 DEFINE_integer rootfs_hash_pad 8 \
-  "MBs reserved at the end of the rootfs image."
+  "MiBs reserved at the end of the rootfs image."
 DEFINE_integer statefulfs_size 1024 \
-  "stateful filesystem size in MBs."
+  "stateful filesystem size in MiBs."
 DEFINE_boolean preserve ${FLAGS_FALSE} \
   "Attempt to preserve the previous build image if one can be found (unstable, \
 kernel/firmware not updated)"
 DEFINE_boolean fast ${DEFAULT_FAST} \
   "Call many emerges in parallel"
 
 DEFINE_string usb_disk /dev/sdb3 \
   "Path syslinux should use to do a usb boot. Default: /dev/sdb3"
 
 DEFINE_boolean enable_rootfs_verification ${FLAGS_FALSE} \
@@ skipping 19 matching lines @@
 # so will die prematurely if 'set -e' is specified before now.
 set -e
 
 if [ -z "${FLAGS_board}" ] ; then
   error "--board is required."
   exit 1
 fi
 
 if [ "$((FLAGS_rootfs_size + FLAGS_rootfs_hash_pad))" -gt \
      "${FLAGS_rootfs_partition_size}" ] ; then
-  error "rootfs ($((FLAGS_rootfs_size + FLAGS_rootfs_hash_pad)) MB) is \
-bigger than partition (${FLAGS_rootfs_partition_size} MB)."
+  error "rootfs ($((FLAGS_rootfs_size + FLAGS_rootfs_hash_pad)) MiB) is \
+bigger than partition (${FLAGS_rootfs_partition_size} MiB)."
   exit 1
 fi
 
 # Verify user didn't specify incompatible flags for dev install shim
 if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ] &&
    [ ${FLAGS_dev_install} -eq ${FLAGS_TRUE} ] ; then
   error "Incompatible flags: --factory_install and --dev_install cannot be \
 both set to True. Please specify one or none."
   exit 1
 fi
@@ skipping 334 matching lines @@
 
   # 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.
-  # Minimize rootfs size for dev install shim and factory installer
-  if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ] ||
-     [ ${FLAGS_dev_install} -eq ${FLAGS_TRUE} ] ; then
-    ROOT_SIZE_BYTES=$((1024 * 1024 * 300))
-  else
-    ROOT_SIZE_BYTES=$((1024 * 1024 * ${FLAGS_rootfs_size}))
-  fi
+  # Create root file system disk image.
+  ROOT_SIZE_BYTES=$((1024 * 1024 * ${FLAGS_rootfs_size}))
 
   # Pad out for the hash tree.
   ROOT_HASH_PAD=$((FLAGS_rootfs_hash_pad * 1024 * 1024))
   info "Padding the rootfs image by ${ROOT_HASH_PAD} bytes for hash data"
 
   dd if=/dev/zero of="${ROOT_FS_IMG}" bs=1 count=1 \
      seek=$((ROOT_SIZE_BYTES + ROOT_HASH_PAD - 1))
   sudo losetup "${LOOP_DEV}" "${ROOT_FS_IMG}"
   # Specify a block size and block count to avoid using the hash pad.
   sudo mkfs.ext3 -b 4096 "${LOOP_DEV}" "$((ROOT_SIZE_BYTES / 4096))"
@@ skipping 173 matching lines @@
     cp ${PREVIOUS_DIR}/${PRISTINE_IMAGE_NAME} ${OUTPUT_DIR}
 
     # Copy forward the developer image, if we already copied forward the base.
     if [[ ${FLAGS_withdev} -eq ${FLAGS_TRUE} ]] && \
        [[ -f ${PREVIOUS_DIR}/${DEVELOPER_IMAGE_NAME} ]] ; then
       cp ${PREVIOUS_DIR}/${DEVELOPER_IMAGE_NAME} ${OUTPUT_DIR}
     fi
   fi
 fi
 
+# Minimize rootfs size for dev install shim and factory installer
+if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} -o \
+     ${FLAGS_dev_install} -eq ${FLAGS_TRUE} ] ; then
+  info "Fixing the rootfs size at 300 MiB for the factory installer"
+  FLAGS_rootfs_size=300
+fi
+
 # Create the boot.desc file which stores the build-time configuration
 # information needed for making the image bootable after creation with
 # cros_make_image_bootable.
 create_boot_desc
 
 if [[ -f ${PRISTINE_IMG} ]] ; then
   update_base_packages ${PRISTINE_IMAGE_NAME}
 else
   create_base_image ${PRISTINE_IMAGE_NAME}
 fi
@@ skipping 48 matching lines @@
   echo "Developer image created as ${DEVELOPER_IMAGE_NAME}"
 fi
 
 print_time_elapsed
 
 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, INSIDE the chroot, do something like:"
 echo "  ./image_to_vm.sh --from=${OUTSIDE_OUTPUT_DIR}"
 echo "from the scripts directory where you entered the chroot."