Update mod_image_for_test to use the new factorytest-init package

mod_image_for_test.sh

Index: mod_image_for_test.sh
diff --git a/mod_image_for_test.sh b/mod_image_for_test.sh
index 25c2fb72b2504c9d20ef5e82b54ab922a321bbdd..f570d7a578a8ec70d9c7fd95c3d1ca500b636961 100755
--- a/mod_image_for_test.sh
+++ b/mod_image_for_test.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
+# Copyright (c) 2011 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.
 
@@ -228,19 +228,22 @@ trap cleanup EXIT
 
 emerge_chromeos_test
 
-MOD_TEST_ROOT="${GCLIENT_ROOT}/src/scripts/mod_for_test_scripts"
+MOD_TEST_SCRIPT="${SCRIPTS_DIR}/mod_for_test_scripts/test_setup.sh"
 # Run test setup script to modify the image
 sudo GCLIENT_ROOT="${GCLIENT_ROOT}" ROOT_FS_DIR="${ROOT_FS_DIR}" \
-    STATEFUL_DIR="${STATEFUL_DIR}" ARCH="${ARCH}" "${MOD_TEST_ROOT}/test_setup.sh"
+    STATEFUL_DIR="${STATEFUL_DIR}" ARCH="${ARCH}" "${MOD_TEST_SCRIPT}"
 
 if [ ${FLAGS_factory} -eq ${FLAGS_TRUE} ]; then
+  sudo INSTALL_MASK="$INSTALL_MASK" $EMERGE_BOARD_CMD \
+    --root="$ROOT_FS_DIR" --root-deps=rdeps \
+    factorytest-init $EMERGE_JOBS

[Vince Laviano, 2011/03/18 02:45:45]

Maybe use the "${FOO}" variable quoting style here for consistency with the rest
of the file.

[jrbarnette, 2011/03/18 20:31:48]

The rest of the file had no consistency, either...

I've uploaded changes to fix this style nit and a large raft of others.

+
   install_autotest
 
-  MOD_FACTORY_ROOT="${GCLIENT_ROOT}/src/scripts/mod_for_factory_scripts"
+  MOD_FACTORY_SCRIPT="${SCRIPTS_DIR}/mod_for_factory_scripts/factory_setup.sh"
   # Run factory setup script to modify the image
   sudo GCLIENT_ROOT="${GCLIENT_ROOT}" ROOT_FS_DIR="${ROOT_FS_DIR}" \
-      QUALDB="${FLAGS_qualdb}" BOARD=${FLAGS_board} \
-      "${MOD_FACTORY_ROOT}/factory_setup.sh"
+      QUALDB="${FLAGS_qualdb}" BOARD=${FLAGS_board} "${MOD_FACTORY_SCRIPT}"
 fi
 
 # Re-run ldconfig to fix /etc/ldconfig.so.cache.