From 29d962035e3dda3fd76202be108d8d3e37209dfc Mon Sep 17 00:00:00 2001 From: Tan Gao Date: Thu, 30 Sep 2010 10:41:09 -0700 Subject: [PATCH] remove second call to free up loop device Change-Id: Ibf52597f01b7868f8472d2042e4d335442b82597 TEST=manually build a dev recovery image and verified no loop device warning was outputted by losetup call Review URL: http://codereview.chromium.org/3439024 --- mod_image_for_dev_recovery.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/mod_image_for_dev_recovery.sh b/mod_image_for_dev_recovery.sh index 7523e59486..e94f687b6d 100755 --- a/mod_image_for_dev_recovery.sh +++ b/mod_image_for_dev_recovery.sh @@ -176,7 +176,7 @@ create_dev_recovery_image() { # 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}" @@ -189,7 +189,6 @@ create_dev_recovery_image() { # 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} }