Merge pull request #687 from dm0-/workon-mantle

enter_chroot: initialize with mantle in cros_workon
This commit is contained in:
David Michael 2017-08-10 17:39:45 -07:00 committed by GitHub
commit 7f99054c9d

View File

@ -380,6 +380,15 @@ setup_env() {
if [ -d "${gsutil_dir}" ]; then if [ -d "${gsutil_dir}" ]; then
chown -R ${SUDO_UID}:${SUDO_GID} "${gsutil_dir}" chown -R ${SUDO_UID}:${SUDO_GID} "${gsutil_dir}"
fi fi
# The SDK should track mantle's master branch by default.
workon_dir="${FLAGS_trunk}/.config/cros_workon"
if [ ! -e "${workon_dir}" ]; then
mkdir -p "${workon_dir}"
echo '=coreos-devel/mantle-9999' > "${workon_dir}/host"
echo '<coreos-devel/mantle-9999' > "${workon_dir}/host.mask"
chown -R ${SUDO_UID}:${SUDO_GID} "${FLAGS_trunk}/.config"
fi
) 200>>"$LOCKFILE" || die "setup_env failed" ) 200>>"$LOCKFILE" || die "setup_env failed"
} }