Always build pristine image as well as dev/test image.

src/scripts/mount_gpt_image.sh

Index: src/scripts/mount_gpt_image.sh
diff --git a/src/scripts/mount_gpt_image.sh b/src/scripts/mount_gpt_image.sh
index a739675d4965933f9c10bf4395c3afb702d7b846..a40a6bc31563dd413d9405c52279bdb56cbf6ad6 100755
--- a/src/scripts/mount_gpt_image.sh
+++ b/src/scripts/mount_gpt_image.sh
@@ -41,12 +41,10 @@ function unmount_image() {
       "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}"
@@ -84,16 +82,14 @@ function mount_image() {
     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."
 }