mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-07 13:06:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(*): use COREOS_OFFICIAL

Browse Source 
use the COREOS_OFFICIAL env variable instead of CHROMEOS_OFFICIAL
This commit is contained in:
Brandon Philips 2013-06-30 19:39:39 -07:00
parent 6ac55484e2
commit aa7eed311a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chroot_version_hooks.d/19_sudo_90_cros
View File

@ -11,7 +11,7 @@ if [ ! -e ${frag} ]; then
tmp=$(mktemp 2>/dev/null || echo /tmp/17_upgrade_hook.$$)
cat <<EOF > "${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

4
sdk_lib/enter_chroot.sh
View File

@ -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}" ] && \