mirror of
https://github.com/flatcar/scripts.git
synced 2025-11-24 03:51:33 +01:00
enter_chroot.sh: always generate en_US locales
The buildbot code forces the en_US.UTF8 locale itself, and does so inside
of the chroot, so our auto-detection code doesn't catch it. Always create
these locales that the buildbot uses.
BUG=None
TEST=cleared out locales, emptied out active locale env vars, ran enter_chroot, saw that en_US{,UTF8} were created
Change-Id: I9ad65007a340333e19743985c9cbeea9403823fa
Reviewed-on: http://gerrit.chromium.org/gerrit/6168
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
This commit is contained in:
parent
d899f8d93f
commit
4fc9c2706d
@ -316,7 +316,9 @@ function setup_env {
|
||||
|
||||
# Make sure user's requested locales are available
|
||||
# http://crosbug.com/19139
|
||||
locales=$(printf '%s\n' ${LANG} \
|
||||
# And make sure en_US{,.UTF-8} are always available as
|
||||
# that what buildbot forces internally
|
||||
locales=$(printf '%s\n' en_US en_US.UTF-8 ${LANG} \
|
||||
$LC_{ADDRESS,ALL,COLLATE,CTYPE,IDENTIFICATION,MEASUREMENT,MESSAGES} \
|
||||
$LC_{MONETARY,NAME,NUMERIC,PAPER,TELEPHONE,TIME} | \
|
||||
sort -u | sed '/^C$/d')
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user