diff --git a/chroot_version_hooks.d/19_sudo_90_cros b/chroot_version_hooks.d/19_sudo_90_cros index 7f664d54c2..4a9352a0b1 100644 --- a/chroot_version_hooks.d/19_sudo_90_cros +++ b/chroot_version_hooks.d/19_sudo_90_cros @@ -11,7 +11,7 @@ if [ ! -e ${frag} ]; then tmp=$(mktemp 2>/dev/null || echo /tmp/17_upgrade_hook.$$) cat < "${tmp}" || exit 1 Defaults env_keep += CROS_WORKON_SRCROOT -Defaults env_keep += CHROMEOS_OFFICIAL +Defaults env_keep += COREOS_OFFICIAL Defaults env_keep += PORTAGE_USERNAME Defaults env_keep += http_proxy Defaults env_keep += ftp_proxy diff --git a/sdk_lib/enter_chroot.sh b/sdk_lib/enter_chroot.sh index d4d421be44..3bb46733ea 100755 --- a/sdk_lib/enter_chroot.sh +++ b/sdk_lib/enter_chroot.sh @@ -28,7 +28,7 @@ DEFINE_string chrome_root_mount "/home/${SUDO_USER}/chrome_root" \ DEFINE_string cache_dir "" "Directory to use for caching." DEFINE_boolean official_build $FLAGS_FALSE \ - "Set CHROMEOS_OFFICIAL=1 for release builds." + "Set COREOS_OFFICIAL=1 for release builds." DEFINE_boolean ssh_agent $FLAGS_TRUE "Import ssh agent." DEFINE_boolean early_make_chroot $FLAGS_FALSE \ "Internal flag. If set, the command is run as root without sudo." @@ -66,7 +66,7 @@ FLAGS "$@" || exit 1 eval set -- "${FLAGS_ARGV}" if [ $FLAGS_official_build -eq $FLAGS_TRUE ]; then - CHROMEOS_OFFICIAL=1 + COREOS_OFFICIAL=1 fi [ -z "${FLAGS_cache_dir}" ] && \