Cleanup of adding pristine image and fixing of symlinks in developer image.

src/scripts/mount_gpt_image.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.
 
 # Helper script that mounts chromium os image from a device or directory
 # and creates mount points for /var and /usr/local (if in dev_mode).
 
 . "$(dirname "$0")/common.sh"
@@ skipping 26 matching lines @@
 
 # Common unmounts for either a device or directory
 function unmount_image() {
   echo "Unmounting image from ${FLAGS_stateful_mountpt}" \
       "and ${FLAGS_rootfs_mountpt}"
   # Don't die on error to force cleanup
   set +e
   # Reset symlinks in /usr/local.
   setup_symlinks_on_root "/usr/local" "/var" \
     "${FLAGS_stateful_mountpt}"
+  fix_broken_symlinks "${FLAGS_rootfs_mountpt}"
   sudo umount "${FLAGS_rootfs_mountpt}/usr/local"
   sudo umount "${FLAGS_rootfs_mountpt}/var"
   sudo umount -d "${FLAGS_stateful_mountpt}"
   sudo umount -d "${FLAGS_rootfs_mountpt}"
   set -e
 }
 
 function get_usb_partitions() {
   sudo mount "${FLAGS_from}3" "${FLAGS_rootfs_mountpt}"
   sudo mount "${FLAGS_from}1" "${FLAGS_stateful_mountpt}"
@@ skipping 45 matching lines @@
 
 # Turn path into an absolute path.
 FLAGS_from=`eval readlink -f ${FLAGS_from}`
 
 # Perform desired operation.
 if [ ${FLAGS_unmount} -eq ${FLAGS_TRUE} ] ; then
   unmount_image
 else
   mount_image
 fi