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

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.
@@ skipping 57 matching lines @@
 cleanup() {
   # Disable die on error.
   set +e
 
   cleanup_rootfs_mounts
   if [ -n "${LOOP_DEV}" ]
   then
     cleanup_rootfs_loop
   fi
 
+  rmdir "${ROOT_FS_DIR}"
+
   # Turn die on error back on.
   set -e
 }
 
 # main process begins here.
 
 # Make sure this is really what the user wants, before nuking the device
 if [ $FLAGS_yes -ne $FLAGS_TRUE ]; then
   read -p "Modifying image ${FLAGS_image} for test; are you sure (y/N)? " SURE
   SURE="${SURE:0:1}" # Get just the first character
   if [ "$SURE" != "y" ]; then
     echo "Ok, better safe than sorry."
     exit 1
   fi
 else
   echo "Modifying image ${FLAGS_image} for test..."
 fi
 
 set -e
-trap cleanup EXIT
 
 ROOT_FS_DIR=$(dirname "${FLAGS_image}")/rootfs
 mkdir -p "${ROOT_FS_DIR}"
 
+trap cleanup EXIT
+
 # Figure out how to loop mount the rootfs partition. It should be partition 3
 # on the disk image.
 offset=$(partoffset "${FLAGS_image}" 3)
 
 LOOP_DEV=$(sudo losetup -f)
 if [ -z "$LOOP_DEV" ]; then
   echo "No free loop device"
   exit 1
 fi
 sudo losetup -o $(( $offset * 512 )) "${LOOP_DEV}" "${FLAGS_image}"
@@ skipping 27 matching lines @@
       ${ROOT_FS_DIR}/usr/local/manufacturing/qualified_components
   else
     echo "No qualified component file found at: ${FLAGS_qualdb}"
     exit 1
   fi
 fi
 
 cleanup
 trap - EXIT