diff options
author | Jan Wagner <mail@jwagner.eu> | 2016-03-13 13:40:33 +0100 |
---|---|---|
committer | Jan Wagner <mail@jwagner.eu> | 2016-03-13 13:40:33 +0100 |
commit | b855bcffebe13327660e4e7955de5e38018bcb90 (patch) | |
tree | 9989072c0557d00d4fafbdcdffe3cc262ad03273 /bootstrap.d/12-locale.sh | |
parent | 94ac6dc790aa5066b623e9706bdf0c98f7d40aa7 (diff) | |
download | rpi2-gen-image-b855bcffebe13327660e4e7955de5e38018bcb90.tar.gz rpi2-gen-image-b855bcffebe13327660e4e7955de5e38018bcb90.tar.bz2 rpi2-gen-image-b855bcffebe13327660e4e7955de5e38018bcb90.zip |
comment-cleanup, net-cleanup, size-calc-fix, split-more, menuconfig
Diffstat (limited to 'bootstrap.d/12-locale.sh')
-rw-r--r-- | bootstrap.d/12-locale.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bootstrap.d/12-locale.sh b/bootstrap.d/12-locale.sh index cff48b2..06ad5a5 100644 --- a/bootstrap.d/12-locale.sh +++ b/bootstrap.d/12-locale.sh @@ -5,11 +5,11 @@ # Load utility functions . ./functions.sh -# Set up timezone +# Install and setup timezone echo ${TIMEZONE} >$R/etc/timezone chroot_exec dpkg-reconfigure -f noninteractive tzdata -# Set up default locale and keyboard configuration +# Install and setup default locale and keyboard configuration if [ "$ENABLE_MINBASE" = false ] ; then # Set locale choice in debconf db, even though dpkg-reconfigure ignores and overwrites them due to some bug # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684134 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685957 @@ -27,7 +27,7 @@ if [ "$ENABLE_MINBASE" = false ] ; then chroot_exec locale-gen chroot_exec update-locale LANG=${DEFLOCAL} - # Keyboard configuration, if requested + # Install and setup default keyboard configuration if [ "$XKB_MODEL" != "" ] ; then sed -i "s/^XKBMODEL.*/XKBMODEL=\"${XKB_MODEL}\"/" $R/etc/default/keyboard fi @@ -42,7 +42,7 @@ if [ "$ENABLE_MINBASE" = false ] ; then fi chroot_exec dpkg-reconfigure -f noninteractive keyboard-configuration - # Set up font console + # Install and setup font console case "${DEFLOCAL}" in *UTF-8) sed -i 's/^CHARMAP.*/CHARMAP="UTF-8"/' $R/etc/default/console-setup @@ -53,6 +53,6 @@ if [ "$ENABLE_MINBASE" = false ] ; then esac chroot_exec dpkg-reconfigure -f noninteractive console-setup else # ENABLE_MINBASE=true - # Set POSIX default locales + # Install POSIX default locale install_readonly files/locales/locale $R/etc/default/locale fi |