Clean up temporary files and directories left by build_image, etc.

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 rootfs.image and mbr.image"
+  "Directory containing chromiumos_image.bin"
 DEFINE_string to "" "${DEFAULT_TO_HELP}"
 DEFINE_boolean yes ${FLAGS_FALSE} "Answer yes to all prompts" "y"
 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}" \
-  "Uses test image if available, otherwise creates one as rootfs_test.image."
+  "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}"
 
 # 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 ]
@@ skipping 53 matching lines @@
   # Copy it.
   echo "Creating test image from original..."
   cp -f "${SRC_IMAGE}" "${FLAGS_from}/chromiumos_test_image.bin"
   # Use it.
   SRC_IMAGE="${FLAGS_from}/chromiumos_test_image.bin"
   # Modify it.
   "${SCRIPTS_DIR}/mod_image_for_test.sh" --image "${SRC_IMAGE}"
 fi
 
 STATEFUL_DIR="${FLAGS_from}/stateful_partition"
+mkdir -p "${STATEFUL_DIR}"
 
 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.
@@ skipping 18 matching lines @@
     sudo mkdir -p "${stateful_root}${autotest_client}"
 
     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 make_autotest.sh inside chroot first."
     exit -1
   fi
 fi
 
 
 # Let's do it.
 if [ -b "${FLAGS_to}" ]
@@ skipping 47 matching lines @@
   echo "   sudo dd if=${FLAGS_to} of=/dev/sdb bs=4M"
   echo "where /dev/sdb is the entire keyfob."
   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