openstack
/
diskimage-builder
Code Issues Proposed changes

Merge "Set default locale to image in debootstrap element"

This commit is contained in:
Jenkins 2016-03-23 06:52:49 +00:00 committed by Gerrit Code Review
parent 683757e572 af84759e12
commit caf0c404cc
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/debootstrap/README.rst
View File

@ -30,6 +30,10 @@ filesystem. By default this is 0 (disabled) and any other value enables this.
If run in offline mode then the most recently cached rootfs is used instead of
being built.
The `DIB_DEBOOTSTRAP_DEFAULT_LOCALE` environment variable may be used
to configure the default locale of the base image. It defaults to
C.UTF-8.
-------------------
Note on ARM systems
-------------------

1
elements/debootstrap/environment.d/10-debootstrap-default-locale Normal file
View File

@ -0,0 +1 @@
export DIB_DEBOOTSTRAP_DEFAULT_LOCALE=${DIB_DEBOOTSTRAP_DEFAULT_LOCALE:-C.UTF-8}

6
elements/debootstrap/install.d/12-debian-locale-gen
View File

@ -30,3 +30,9 @@ locales locales/default_environment_locale select en_US.UTF-8
EOF
dpkg-reconfigure -f noninteractive locales
# set on configuration
cat > /etc/default/locale <<EOF
LANG=$DIB_DEBOOTSTRAP_DEFAULT_LOCALE
LC_ALL=$DIB_DEBOOTSTRAP_DEFAULT_LOCALE
EOF