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

src/scripts/common.sh

 # 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.
 
 # Common constants for build scripts
 # This must evaluate properly for both /bin/bash and /bin/sh
 
 # All scripts should die on error unless commands are specifically excepted
 # by prefixing with '!' or surrounded by 'set +e' / 'set -e'.
 # TODO: Re-enable this once shflags is less prone to dying.
@@ skipping 351 matching lines @@
   shift
 
   if ! sudo umount -d "${path}"; then
     warn "Failed to unmount ${path}"
     warn "Doing a lazy unmount"
 
     sudo umount -d -l "${path}" || die "Failed to lazily unmount ${path}"
   fi
 }
 
+# Fixes symlinks that are incorrectly prefixed with the build root ${1}
+# rather than the real running root '/'.
+# TODO(sosa) - Merge setup - cleanup below with this method.
+fix_broken_symlinks() {
+  local build_root="${1}"
+  local symlinks=$(find "${build_root}/usr/local" -lname "${build_root}/*")
+  for symlink in ${symlinks}; do
+    echo "Fixing ${symlink}"
+    local target=$(ls -l "${symlink}" | cut -f 2 -d '>')
+    # Trim spaces from target (bashism).
+    target=${target/ /}
+    # Make new target (removes rootfs prefix).
+    new_target=$(echo ${target} | sed "s#${build_root}##")
+
+    echo "Fixing symlink ${symlink}"
+    sudo unlink "${symlink}"
+    sudo ln -sf "${new_target}" "${symlink}"
+  done
+}
+
 # Sets up symlinks for the developer root. It is necessary to symlink
 # usr and local since the developer root is mounted at /usr/local and
 # applications expect to be installed under /usr/local/bin, etc.
 # This avoids packages installing into /usr/local/usr/local/bin.
 # ${1} specifies the symlink target for the developer root.
 # ${2} specifies the symlink target for the var directory.
 # ${3} specifies the location of the stateful partition.
 setup_symlinks_on_root() {
   # Give args better names.
   local dev_image_target=${1}
@@ skipping 20 matching lines @@
 
   # Setup var symlink.
   if [ -h "${dev_image_root}/var" ]; then
     sudo unlink "${dev_image_root}/var"
   elif [ -e "${dev_image_root}/var" ]; then
     die "${dev_image_root}/var should be a symlink if it exists"
   fi
 
   sudo ln -s "${var_target}" "${dev_image_root}/var"
 }