| @@ -28,10 +28,10 if [ $(echo "$APT_INCLUDES" | grep ",locales") ] ; then | |||||
| 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 | |
| @@ -95,7 +95,7 if [ "$ENABLE_INITRAMFS" = true ] ; then | |||||
| 95 | fi |
|
95 | fi | |
| 96 |
|
96 | |||
| 97 | # Disable RPi3 Bluetooth and restore ttyAMA0 serial device |
|
97 | # Disable RPi3 Bluetooth and restore ttyAMA0 serial device | |
| 98 | if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ]; then |
|
98 | if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then | |
| 99 | if [ "$ENABLE_CONSOLE" = true ] && [ "$ENABLE_UBOOT" = false ] ; then |
|
99 | if [ "$ENABLE_CONSOLE" = true ] && [ "$ENABLE_UBOOT" = false ] ; then | |
| 100 | echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt" |
|
100 | echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt" | |
| 101 | echo "enable_uart=1" >> "${BOOT_DIR}/config.txt" |
|
101 | echo "enable_uart=1" >> "${BOOT_DIR}/config.txt" | |
General Comments 0
Vous devez vous connecter pour laisser un commentaire.
Se connecter maintenant
