cros-board: update!

diff --git a/.bin/cros-board b/.bin/cros-board
index 58a7870a53ea6c27007cca3104b6e09e58c50fcc..e4a793bf6cfa5e0531015f54f50610f2a77c1f60 100755 (executable)
--- a/.bin/cros-board
+++ b/.bin/cros-board
@@ -110,7 +110,7 @@ run ./update_chroot --toolchain_boards=${BOARD}
 if ${ARG_CLEAN} || [[ ! -d ${BUILD} ]] ; then
        run sudo rm -rf "${BUILD}"
        run setup_board --board=${BOARD} --skip-chroot-upgrade
-       if [ $? -ne 0 ] ; then
+       if [[ $? -ne 0 ]] ; then
                run sudo rm -rf "${BUILD}"
                exit 1
        fi
@@ -121,11 +121,12 @@ run ./build_packages \
        --nowithdebug \
        --nowithrevdeps \
        --skip-chroot-upgrade \
+       --autosetgov \
        $(tfe ${ARG_AUTOTEST} --{,no}withautotest) \
        $(tfe ${ARG_FACTORY} --{,no}withfactory) \
        $(tfe ${ARG_NOPKG} --{no,}usepkg) \
        $(tfe ${ARG_TEST} --{,no}withtest)
-BUILD_IMG="./build_image --board=${BOARD} --noenable_rootfs_verification $(tfe ${ARG_TEST} test) dev"
+BUILD_IMG="./build_image --board=${BOARD} --noenable_rootfs_verification $(tfe ${ARG_TEST} test base)"
 run ${BUILD_IMG}
 
 IMG_TO_USB="cros flash --yes usb://${ARG_DEV} xbuddy://local/${BOARD}/latest/dev"