remove second call to free up loop device

mod_image_for_dev_recovery.sh

 #!/bin/bash
 
 # Copyright (c) 2010 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 create a Chrome OS dev recovery image using a dev install shim
 
 # Source constants and utility functions
 . "$(dirname "$0")/common.sh"
@@ skipping 57 matching lines @@
 else
   info "Using a recent dev install shim at ${FLAGS_dev_install_shim}"
 fi
 
 # Constants
 INSTALL_SHIM_DIR="$(dirname "$FLAGS_dev_install_shim")"
 DEV_RECOVERY_IMAGE="dev_recovery_image.bin"
 
 umount_from_loop_dev() {
   local mnt_pt=$1
   mount | grep -q " on ${mnt_pt}" && sudo umount ${mnt_pt}

[Will Drewry, 2010/09/29 22:19:03]

does this need to be umount -d, or is it implicit?

[Tan Gao, 2010/09/30 16:55:50]

it's implicit. Quoting the man page

"The umount command will free the loop device (if any) associated with the
mount, in case it finds the option 'loop=...' in /etc/mtab, or when the -d
option was given."

   rmdir ${mnt_pt}
 }
 
 cleanup_loop_dev() {
   sudo losetup -d ${1} || /bin/true
 }
 
 get_loop_dev() {
   local loop_dev=$(sudo losetup -f)
   if [ -z "${loop_dev}" ]; then
@@ skipping 80 matching lines @@
   local stateful_offset=$(partoffset ${FLAGS_dev_install_shim} 1)
   local stateful_count=$(partsize ${FLAGS_dev_install_shim} 1)
   dd if="${FLAGS_dev_install_shim}" of="${temp_state}" conv=notrunc bs=512 \
     skip=${stateful_offset} count=${stateful_count} &>/dev/null
 
   local resized_sectors=$(resize_partition $temp_state $PAYLOAD_DIR_SIZE)
 
   # Mount resized stateful FS and copy payload content to its root directory
   local temp_mnt=$(mktemp -d "/tmp/temp_mnt.XXXXXX")
   local loop_dev=$(get_loop_dev)
-  trap "umount_from_loop_dev ${temp_mnt} && cleanup_loop_dev ${loop_dev}" EXIT
+  trap "umount_from_loop_dev ${temp_mnt} && rm -f \"${temp_state}\"" EXIT
   mkdir -p "${temp_mnt}"
   sudo mount -o loop=${loop_dev} "${temp_state}" "${temp_mnt}"
   sudo cp -R "${FLAGS_payload_dir}" "${temp_mnt}"
   sudo mv "${temp_mnt}/$(basename ${FLAGS_payload_dir})" \
     "${temp_mnt}/dev_payload"
   # Mark image as dev recovery
   sudo touch "${temp_mnt}/.recovery"
   sudo touch "${temp_mnt}/.dev_recovery"
 
   # TODO(tgao): handle install script (for default and custom cases)
   local temp_img=$(update_partition_table $temp_state $resized_sectors)
 
-  rm -f "${temp_state}"
   # trap handler will clean up loop device and temp mount point
   echo ${temp_img}
 }
 
 # Main
 DST_PATH="${INSTALL_SHIM_DIR}/${DEV_RECOVERY_IMAGE}"
 info "Attempting to create dev recovery image using dev install shim \
 ${FLAGS_dev_install_shim}"
 TEMP_IMG=$(create_dev_recovery_image)
 
 mv -f $TEMP_IMG $DST_PATH
 info "Dev recovery image created at ${DST_PATH}"