From 3f21b99e37248e6e84cb4bf764c4c3b509b1909f Mon Sep 17 00:00:00 2001
From: Chris Sosa <sosa@chromium.org>
Date: Mon, 10 May 2010 16:34:47 -0700
Subject: [PATCH] Dev flag is not used in customize_rootfs and we should not be
 making dev-specific changes there.

TEST=Built an image

Review URL: http://codereview.chromium.org/2019008
---
 build_image | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/build_image b/build_image
index 88f420d149..3eb32e4a8c 100755
--- a/build_image
+++ b/build_image
@@ -342,12 +342,6 @@ if [[ $FLAGS_withtest -eq $FLAGS_TRUE ]] ; then
       --usepkgonly chromeos-test $EMERGE_JOBS
 fi
 
-# Perform any customizations on the root file system that are needed.
-EXTRA_CUSTOMIZE_ROOTFS_FLAGS=""
-if [ $FLAGS_withdev -eq $FLAGS_TRUE ]; then
-  EXTRA_CUSTOMIZE_ROOTFS_FLAGS="--withdev"
-fi
-
 # Extract the kernel from the root filesystem for use by the GPT image. Legacy
 # BIOS will use the kernel in the rootfs (via syslinux), Chrome OS BIOS will
 # use the kernel partition.
@@ -406,11 +400,11 @@ if [[ $FLAGS_withdev -eq $FLAGS_TRUE ]] ||\
   sudo /sbin/ldconfig -r "$ROOT_FS_DIR"
 fi
 
+# Perform any customizations on the root file system that are needed.
 "${SCRIPTS_DIR}/customize_rootfs" \
   --root="$ROOT_FS_DIR" \
   --target="$ARCH" \
-  --board="$BOARD" \
-  $EXTRA_CUSTOMIZE_ROOTFS_FLAGS
+  --board="$BOARD"
 
 # Check that the image has been correctly created.
 "${SCRIPTS_DIR}/test_image" \