Always build pristine image as well as dev/test 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 23 matching lines @@
 
 # Die on error
 set -e
 
 # 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
-  if [ -e "${FLAGS_rootfs_mountpt}/root/.dev_mode" ] ; then
-    # Reset symlinks in /usr/local.
-    setup_symlinks_on_root "/usr/local" "/var" \
-      "${FLAGS_stateful_mountpt}"
-    sudo umount "${FLAGS_rootfs_mountpt}/usr/local"
-  fi
+  # Reset symlinks in /usr/local.
+  setup_symlinks_on_root "/usr/local" "/var" \
+    "${FLAGS_stateful_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 17 matching lines @@
   mkdir -p "${FLAGS_rootfs_mountpt}"
   mkdir -p "${FLAGS_stateful_mountpt}"
 
   # Get the partitions for the image / device.
   if [ -b ${FLAGS_from} ] ; then
     get_usb_partitions
   else
     get_gpt_partitions
   fi
 
-  # Mount var unconditionally and then setup /usr/local for user of dev mode.
+  # Mount directories and setup symlinks.
   sudo mount --bind "${FLAGS_stateful_mountpt}/var" \
     "${FLAGS_rootfs_mountpt}/var"
-  if [ -e "${FLAGS_rootfs_mountpt}/root/.dev_mode" ] ; then
-    sudo mount --bind "${FLAGS_stateful_mountpt}/dev_image" \
-      "${FLAGS_rootfs_mountpt}/usr/local"
-    # Setup symlinks in /usr/local so you can emerge packages into /usr/local.
-    setup_symlinks_on_root "${FLAGS_stateful_mountpt}/dev_image" \
-      "${FLAGS_stateful_mountpt}/var" "${FLAGS_stateful_mountpt}"
-  fi
+  sudo mount --bind "${FLAGS_stateful_mountpt}/dev_image" \
+    "${FLAGS_rootfs_mountpt}/usr/local"
+  # Setup symlinks in /usr/local so you can emerge packages into /usr/local.
+  setup_symlinks_on_root "${FLAGS_stateful_mountpt}/dev_image" \
+    "${FLAGS_stateful_mountpt}/var" "${FLAGS_stateful_mountpt}"
   echo "Image specified by ${FLAGS_from} mounted at"\
     "${FLAGS_rootfs_mountpt} successfully."
 }
 
 # Find the last image built on the board.
 if [ ${FLAGS_most_recent} -eq ${FLAGS_TRUE} ] ; then
   IMAGES_DIR="${DEFAULT_BUILD_ROOT}/images/${FLAGS_board}"
   FLAGS_from="${IMAGES_DIR}/$(ls -t ${IMAGES_DIR} 2>&-| head -1)"
 fi
 
 # 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