@@ -42,7 +42,7 Set system host name. It's recommended that the host name is unique in the corre | |||
|
42 | 42 | Set system `root` password. The same password is used for the created user `pi`. It's **STRONGLY** recommended that you choose a custom password. |
|
43 | 43 | |
|
44 | 44 | ##### `DEFLOCAL`="en_US.UTF-8" |
|
45 | Set default system locale. This setting can also be changed inside the running OS using the `dpkg-reconfigure locales` command. The script variant `minbase` (ENABLE_MINBASE=true) doesn't install `locales`. | |
|
45 | Set default system locale. This setting can also be changed inside the running OS using the `dpkg-reconfigure locales` command. Please note that on using this parameter the script will automatically install the required packages `locales`, `keyboard-configuration` and `console-setup`. | |
|
46 | 46 | |
|
47 | 47 | ##### `TIMEZONE`="Europe/Berlin" |
|
48 | 48 | Set default system timezone. All available timezones can be found in the `/usr/share/zoneinfo/` directory. This setting can also be changed inside the running OS using the `dpkg-reconfigure tzdata` command. |
@@ -10,7 +10,7 echo ${TIMEZONE} > "${ETCDIR}/timezone" | |||
|
10 | 10 | chroot_exec dpkg-reconfigure -f noninteractive tzdata |
|
11 | 11 | |
|
12 | 12 | # Install and setup default locale and keyboard configuration |
|
13 | if [ "$ENABLE_MINBASE" = false ] ; then | |
|
13 | if [ $(echo "$APT_INCLUDES" | grep ",locales") ] ; then | |
|
14 | 14 | # Set locale choice in debconf db, even though dpkg-reconfigure ignores and overwrites them due to some bug |
|
15 | 15 | # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=684134 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=685957 |
|
16 | 16 | # ... so we have to set locales manually |
@@ -52,7 +52,7 if [ "$ENABLE_MINBASE" = false ] ; then | |||
|
52 | 52 | ;; |
|
53 | 53 | esac |
|
54 | 54 | chroot_exec dpkg-reconfigure -f noninteractive console-setup |
|
55 | else # ENABLE_MINBASE=true | |
|
55 | else # (no locales were installed) | |
|
56 | 56 | # Install POSIX default locale |
|
57 | 57 | install_readonly files/locales/locale "${ETCDIR}/default/locale" |
|
58 | 58 | fi |
@@ -1,7 +1,7 | |||
|
1 | 1 | #!/bin/sh |
|
2 | 2 | |
|
3 | 3 | ######################################################################## |
|
4 |
# rpi2-gen-image.sh |
|
|
4 | # rpi2-gen-image.sh 2015-2016 | |
|
5 | 5 | # |
|
6 | 6 | # Advanced debian "jessie" bootstrap script for RPi2 |
|
7 | 7 | # |
@@ -10,9 +10,9 | |||
|
10 | 10 | # as published by the Free Software Foundation; either version 2 |
|
11 | 11 | # of the License, or (at your option) any later version. |
|
12 | 12 | # |
|
13 | # some parts based on rpi2-build-image: | |
|
14 | # Copyright (C) 2015 Ryan Finnie <ryan@finnie.org> | |
|
15 | # Copyright (C) 2015 Luca Falavigna <dktrkranz@debian.org> | |
|
13 | # Copyright (C) 2015 Jan Wagner <mail@jwagner.eu> | |
|
14 | # | |
|
15 | # Big thanks for patches and enhancements by 10+ github contributors! | |
|
16 | 16 | ######################################################################## |
|
17 | 17 | |
|
18 | 18 | # Are we running as root? |
@@ -265,7 +265,7 set -x | |||
|
265 | 265 | trap cleanup 0 1 2 3 6 |
|
266 | 266 | |
|
267 | 267 | # Add required packages for the minbase installation |
|
268 | if [ "$ENABLE_MINBASE" = true ] ; then | |
|
268 | if [ "$ENABLE_MINBASE" = true ] && [ "$DEFLOCAL" == "en_US.UTF-8" ] ; then | |
|
269 | 269 | APT_INCLUDES="${APT_INCLUDES},vim-tiny,netbase,net-tools,ifupdown" |
|
270 | 270 | else |
|
271 | 271 | APT_INCLUDES="${APT_INCLUDES},locales,keyboard-configuration,console-setup" |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant