mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-04 19:56:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

mod_image_for_test: remove --factory_install flag

Browse Source 
This CL removes --factory_install support from mod_image_for_test.
Factory install images are no longer produced using mod_image_for_test.

BUG=chromium-os:12899
TEST=manual

Change-Id: Ia6d6cac07f710cb82473fd696c2717ee660543b6

Review URL: http://codereview.chromium.org/6688015
This commit is contained in:
Vince Laviano 2011-03-17 15:05:14 -07:00
parent 96d116d25e
commit 4f71dfcc84
1 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
mod_image_for_test.sh
View File

@ -39,8 +39,6 @@ get_default_board
DEFINE_string board "$DEFAULT_BOARD" "Board for which the image was built" b
DEFINE_boolean factory $FLAGS_FALSE \
"Modify the image for manufacturing testing" f
DEFINE_boolean factory_install $FLAGS_FALSE \
"Modify the image for factory install shim"
DEFINE_string image "" "Location of the rootfs raw image file" i
DEFINE_boolean installmask $FLAGS_TRUE \
"Use INSTALL_MASK to shrink the resulting image." m
@ -228,38 +226,21 @@ trap cleanup EXIT
"$SCRIPTS_DIR/mount_gpt_image.sh" -i "$IMAGE_NAME" -f "$IMAGE_DIR" \
-r "$ROOT_FS_DIR" -s "$STATEFUL_DIR"
if [ ${FLAGS_factory_install} -eq ${FLAGS_TRUE} ]; then
# We don't want to emerge test packages on factory install, otherwise we run
# out of space.
emerge_chromeos_test
# Run factory setup script to modify the image.
sudo $EMERGE_BOARD_CMD --root=$ROOT_FS_DIR --usepkgonly \
--root-deps=rdeps --nodeps chromeos-factoryinstall
MOD_TEST_ROOT="${GCLIENT_ROOT}/src/scripts/mod_for_test_scripts"
# 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"
# Set factory server if necessary.
if [ "${FACTORY_SERVER}" != "" ]; then
sudo sed -i \
"s/CHROMEOS_AUSERVER=.*$/CHROMEOS_AUSERVER=\
http:\/\/${FACTORY_SERVER}:8080\/update/" \
${ROOT_FS_DIR}/etc/lsb-release
fi
else
emerge_chromeos_test
if [ ${FLAGS_factory} -eq ${FLAGS_TRUE} ]; then
install_autotest
MOD_TEST_ROOT="${GCLIENT_ROOT}/src/scripts/mod_for_test_scripts"
# Run test setup script to modify the image
MOD_FACTORY_ROOT="${GCLIENT_ROOT}/src/scripts/mod_for_factory_scripts"
# Run factory 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"
if [ ${FLAGS_factory} -eq ${FLAGS_TRUE} ]; then
install_autotest
MOD_FACTORY_ROOT="${GCLIENT_ROOT}/src/scripts/mod_for_factory_scripts"
# 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"
fi
QUALDB="${FLAGS_qualdb}" BOARD=${FLAGS_board} \
"${MOD_FACTORY_ROOT}/factory_setup.sh"
fi
# Re-run ldconfig to fix /etc/ldconfig.so.cache.