Fix install mask and move dev_mode to true when dev packages are installed

src/scripts/build_image

 #!/bin/bash
 
 # Copyright (c) 2009 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 build a bootable keyfob-based chromeos system image from within
 # a chromiumos setup. This assumes that all needed packages have been built into
 # the given target's root with binary packages turned on. This script will
 # build the Chrome OS image using only pre-built binary packages.
@@ skipping 259 matching lines @@
   "${PKGDIR}/${CHOST}/cross-${CHOST}"/glibc-${LIBC_VERSION}.tbz2 \
   -C "$ROOT_FS_DIR" --strip-components=3 \
   --exclude=usr/include --exclude=sys-include --exclude=*.a --exclude=*.o
 
 # We need to install libstdc++ manually from the cross toolchain.
 # TODO: Figure out a better way of doing this?
 sudo cp -a "${BOARD_ROOT}"/lib/libgcc_s.so* "${ROOT_FS_DIR}/lib"
 sudo cp -a "${BOARD_ROOT}"/usr/lib/libstdc++.so* "${ROOT_FS_DIR}/usr/lib"
 
 INSTALL_MASK=""
-if [[ $FLAGS_installmask -eq $FLAGS_FALSE ]] ; then
+if [[ $FLAGS_installmask -eq ${FLAGS_TRUE} ]] ; then
   INSTALL_MASK="$DEFAULT_INSTALL_MASK"
 fi
 
 if [[ $FLAGS_jobs -ne -1 ]]; then
   EMERGE_JOBS="--jobs=$FLAGS_jobs"
 fi
 
 # Prepare stateful partition with some pre-created directories
 sudo mkdir -p "${DEV_IMAGE_ROOT}"
 sudo mkdir -p "${STATEFUL_DIR}/var"
@@ skipping 21 matching lines @@
 # Determine the root dir for development packages.
 ROOT_DEV_DIR="$ROOT_FS_DIR"
 [ $FLAGS_statefuldev -eq $FLAGS_TRUE ] && ROOT_DEV_DIR="$ROOT_FS_DIR/usr/local"
 
 # Install development packages.
 if [[ $FLAGS_withdev -eq $FLAGS_TRUE ]] ; then
   sudo INSTALL_MASK="$INSTALL_MASK" emerge-${BOARD} \
       --root="$ROOT_DEV_DIR" --root-deps=rdeps \
       --usepkgonly chromeos-dev $EMERGE_JOBS
 
+  # TODO(sosa@chromium.org) - Re-hide under statefuldev after switch
+  # Flag will mount /usr/local on target device
+  sudo mkdir -p "$ROOT_FS_DIR/root"
+  sudo touch "$ROOT_FS_DIR/root/.dev_mode"
+  
   # The ldd tool is a useful shell script but lives in glibc; just copy it.
   sudo cp -a "$(which ldd)" "${ROOT_DEV_DIR}/usr/bin"
 fi
 
 if [ -n "$FLAGS_factory_server" ]; then
   sudo INSTALL_MASK="$INSTALL_MASK" emerge-${BOARD} \
       --root="$ROOT_DEV_DIR" --root-deps=rdeps \
       --usepkgonly chromeos-factoryinstall $EMERGE_JOBS
 fi
 
@@ skipping 48 matching lines @@
 menuentry "serial debug" {
   linux /efi/boot/vmlinuz earlyprintk=serial,ttyS0,115200 i915.modeset=0 console=ttyS0,115200 acpi=off init=/sbin/init boot=local rootwait root=/dev/sda3 ro noresume noswap loglevel=7
 }
 
 menuentry "normal" {
   linux /efi/boot/vmlinuz quiet console=tty2 init=/sbin/init boot=local rootwait root=/dev/sda3 ro noresume noswap i915.modeset=1 loglevel=1
 }
 
 EOF
 
-# Enable dev mode on the target system and re-run ldconfig
-# for rootfs's ld.so.cache
+# Run ldconfig for rootfs's ld.so.cache
 if [ $FLAGS_statefuldev -eq $FLAGS_TRUE ] ; then
-  # Flag will mount /usr/local on target device
-  sudo mkdir -p "$ROOT_FS_DIR/root"
-  sudo touch "$ROOT_FS_DIR/root/.dev_mode"
-
   # Re-run ldconfig to fix /etc/ldconfig.so.cache
   sudo /sbin/ldconfig -r "$ROOT_FS_DIR"
 
   #TODO(sosa@chromium.org) - /usr/bin/xterm symlink not created in stateful.
   sudo ln -sf "/usr/local/bin/aterm" "/usr/bin/xterm"
 fi
 
 "${SCRIPTS_DIR}/customize_rootfs" \
   --root="$ROOT_FS_DIR" \
   --target="$ARCH" \
@@ skipping 24 matching lines @@
 
 OUTSIDE_OUTPUT_DIR="../build/images/${FLAGS_board}/${IMAGE_SUBDIR}"
 echo "Done.  Image created in ${OUTPUT_DIR}"
 echo "To copy to USB keyfob, OUTSIDE the chroot, do something like:"
 echo "  ./image_to_usb.sh --from=${OUTSIDE_OUTPUT_DIR} --to=/dev/sdb"
 echo "To convert to VMWare image, OUTSIDE the chroot, do something like:"
 echo "  ./image_to_vmware.sh --from=${OUTSIDE_OUTPUT_DIR}"
 echo "from the scripts directory where you entered the chroot."
 
 trap - EXIT