| @@ -1,58 +1,58 | |||||
| 1 | # |
|
1 | # | |
| 2 | # Setup Locales and keyboard settings |
|
2 | # Setup Locales and keyboard settings | |
| 3 | # |
|
3 | # | |
| 4 |
|
4 | |||
| 5 | # Load utility functions |
|
5 | # Load utility functions | |
| 6 | . ./functions.sh |
|
6 | . ./functions.sh | |
| 7 |
|
7 | |||
| 8 | # Install and setup timezone |
|
8 | # Install and setup timezone | |
| 9 | echo ${TIMEZONE} > "${ETC_DIR}/timezone" |
|
9 | echo ${TIMEZONE} > "${ETC_DIR}/timezone" | |
| 10 | chroot_exec dpkg-reconfigure -f noninteractive tzdata |
|
10 | chroot_exec dpkg-reconfigure -f noninteractive tzdata | |
| 11 |
|
11 | |||
| 12 | # Install and setup default locale and keyboard configuration |
|
12 | # Install and setup default locale and keyboard configuration | |
| 13 | if [ $(echo "$APT_INCLUDES" | grep ",locales") ] ; then |
|
13 | if [ $(echo "$APT_INCLUDES" | grep ",locales") ] ; then | |
| 14 | # Set locale choice in debconf db, even though dpkg-reconfigure ignores and overwrites them due to some bug |
|
14 | # Set locale choice in debconf db, even though dpkg-reconfigure ignores and overwrites them due to some bug | |
| 15 | # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684134 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685957 |
|
15 | # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684134 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685957 | |
| 16 | # ... so we have to set locales manually |
|
16 | # ... so we have to set locales manually | |
| 17 | if [ "$DEFLOCAL" = "en_US.UTF-8" ] ; then |
|
17 | if [ "$DEFLOCAL" = "en_US.UTF-8" ] ; then | |
| 18 | chroot_exec echo "locales locales/locales_to_be_generated multiselect ${DEFLOCAL} UTF-8" | debconf-set-selections |
|
18 | chroot_exec echo "locales locales/locales_to_be_generated multiselect ${DEFLOCAL} UTF-8" | debconf-set-selections | |
| 19 | else |
|
19 | else | |
| 20 | # en_US.UTF-8 should be available anyway : https://www.debian.org/doc/manuals/debian-reference/ch08.en.html#_the_reconfiguration_of_the_locale |
|
20 | # en_US.UTF-8 should be available anyway : https://www.debian.org/doc/manuals/debian-reference/ch08.en.html#_the_reconfiguration_of_the_locale | |
| 21 | chroot_exec echo "locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8, ${DEFLOCAL} UTF-8" | debconf-set-selections |
|
21 | chroot_exec echo "locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8, ${DEFLOCAL} UTF-8" | debconf-set-selections | |
| 22 | sed -i "/en_US.UTF-8/s/^#//" "${ETC_DIR}/locale.gen" |
|
22 | sed -i "/en_US.UTF-8/s/^#//" "${ETC_DIR}/locale.gen" | |
| 23 | fi |
|
23 | fi | |
| 24 |
|
24 | |||
| 25 | sed -i "/${DEFLOCAL}/s/^#//" "${ETC_DIR}/locale.gen" |
|
25 | sed -i "/${DEFLOCAL}/s/^#//" "${ETC_DIR}/locale.gen" | |
| 26 | chroot_exec echo "locales locales/default_environment_locale select ${DEFLOCAL}" | debconf-set-selections |
|
26 | chroot_exec echo "locales locales/default_environment_locale select ${DEFLOCAL}" | debconf-set-selections | |
| 27 | chroot_exec locale-gen |
|
27 | chroot_exec locale-gen | |
| 28 | chroot_exec update-locale LANG="${DEFLOCAL}" |
|
28 | chroot_exec update-locale LANG="${DEFLOCAL}" | |
| 29 |
|
29 | |||
| 30 | # Install and setup default keyboard configuration |
|
30 | # Install and setup default keyboard configuration | |
| 31 | if [ "$XKB_MODEL" != "" ] ; then |
|
31 | if [ "$XKB_MODEL" != "pc105" ] ; then | |
| 32 | sed -i "s/^XKBMODEL.*/XKBMODEL=\"${XKB_MODEL}\"/" "${ETC_DIR}/default/keyboard" |
|
32 | sed -i "s/^XKBMODEL.*/XKBMODEL=\"${XKB_MODEL}\"/" "${ETC_DIR}/default/keyboard" | |
| 33 | fi |
|
33 | fi | |
| 34 | if [ "$XKB_LAYOUT" != "" ] ; then |
|
34 | if [ "$XKB_LAYOUT" != "us" ] ; then | |
| 35 | sed -i "s/^XKBLAYOUT.*/XKBLAYOUT=\"${XKB_LAYOUT}\"/" "${ETC_DIR}/default/keyboard" |
|
35 | sed -i "s/^XKBLAYOUT.*/XKBLAYOUT=\"${XKB_LAYOUT}\"/" "${ETC_DIR}/default/keyboard" | |
| 36 | fi |
|
36 | fi | |
| 37 | if [ "$XKB_VARIANT" != "" ] ; then |
|
37 | if [ "$XKB_VARIANT" != "" ] ; then | |
| 38 | sed -i "s/^XKBVARIANT.*/XKBVARIANT=\"${XKB_VARIANT}\"/" "${ETC_DIR}/default/keyboard" |
|
38 | sed -i "s/^XKBVARIANT.*/XKBVARIANT=\"${XKB_VARIANT}\"/" "${ETC_DIR}/default/keyboard" | |
| 39 | fi |
|
39 | fi | |
| 40 | if [ "$XKB_OPTIONS" != "" ] ; then |
|
40 | if [ "$XKB_OPTIONS" != "" ] ; then | |
| 41 | sed -i "s/^XKBOPTIONS.*/XKBOPTIONS=\"${XKB_OPTIONS}\"/" "${ETC_DIR}/default/keyboard" |
|
41 | sed -i "s/^XKBOPTIONS.*/XKBOPTIONS=\"${XKB_OPTIONS}\"/" "${ETC_DIR}/default/keyboard" | |
| 42 | fi |
|
42 | fi | |
| 43 | chroot_exec dpkg-reconfigure -f noninteractive keyboard-configuration |
|
43 | chroot_exec dpkg-reconfigure -f noninteractive keyboard-configuration | |
| 44 |
|
44 | |||
| 45 | # Install and setup font console |
|
45 | # Install and setup font console | |
| 46 | case "${DEFLOCAL}" in |
|
46 | case "${DEFLOCAL}" in | |
| 47 | *UTF-8) |
|
47 | *UTF-8) | |
| 48 | sed -i 's/^CHARMAP.*/CHARMAP="UTF-8"/' "${ETC_DIR}/default/console-setup" |
|
48 | sed -i 's/^CHARMAP.*/CHARMAP="UTF-8"/' "${ETC_DIR}/default/console-setup" | |
| 49 | ;; |
|
49 | ;; | |
| 50 | *) |
|
50 | *) | |
| 51 | sed -i 's/^CHARMAP.*/CHARMAP="guess"/' "${ETC_DIR}/default/console-setup" |
|
51 | sed -i 's/^CHARMAP.*/CHARMAP="guess"/' "${ETC_DIR}/default/console-setup" | |
| 52 | ;; |
|
52 | ;; | |
| 53 | esac |
|
53 | esac | |
| 54 | chroot_exec dpkg-reconfigure -f noninteractive console-setup |
|
54 | chroot_exec dpkg-reconfigure -f noninteractive console-setup | |
| 55 | else # (no locales were installed) |
|
55 | else # (no locales were installed) | |
| 56 | # Install POSIX default locale |
|
56 | # Install POSIX default locale | |
| 57 | install_readonly files/locales/locale "${ETC_DIR}/default/locale" |
|
57 | install_readonly files/locales/locale "${ETC_DIR}/default/locale" | |
| 58 | fi |
|
58 | fi | |
| 1 | NO CONTENT: modified file |
|
NO CONTENT: modified file |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
