Fixed partner issue 1414: Failed to create dev_recovery_image.bin using dev install shim

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")/resize_stateful_partition.sh"
@@ skipping 75 matching lines @@
 
   local resized_sectors=$(enlarge_partition_image $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 "cleanup_loop_dev ${loop_dev}" EXIT
   mkdir -p "${temp_mnt}"
   sudo mount -o loop=${loop_dev} "${temp_state}" "${temp_mnt}"
   trap "umount_from_loop_dev ${temp_mnt} && rm -f \"${temp_state}\"" EXIT
-  sudo cp -R "${FLAGS_payload_dir}" "${temp_mnt}"
-  sudo mv "${temp_mnt}/$(basename ${FLAGS_payload_dir})" \
-    "${temp_mnt}/dev_payload"
+  sudo cp -R "${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)
   (update_partition_table $FLAGS_dev_install_shim $temp_state \
        $resized_sectors $TEMP_IMG)
 
   # trap handler will clean up loop device and temp mount point
 }
 
 # Main
 DST_PATH="${INSTALL_SHIM_DIR}/${DEV_RECOVERY_IMAGE}"
 info "Attempting to create dev recovery image using dev install shim \
 ${FLAGS_dev_install_shim}"
 (create_dev_recovery_image)
 
 if [ -n ${TEMP_IMG} ] && [ -f ${TEMP_IMG} ]; then
   mv -f $TEMP_IMG $DST_PATH
   info "Dev recovery image created at ${DST_PATH}"
 else
   info "Failed to create developer recovery image"
 fi