Raspi2-3_GenImage Commit - r88:29663cdbff03 · Collaboration Tremplin des Sciences

Fixed: DEFLOCAL now works with MINBASE, author added on request

drtyhlpr -

r88:29663cdbff03

parent child

Context file:

r88:29663cdbff03

README.md +1 -1

             Set system `root` password. The same password is used for the created user `pi`. It's **STRONGLY** recommended that you choose a custom password.
             ##### `DEFLOCAL`="en_US.UTF-8"
-            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`.
+            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`.
             ##### `TIMEZONE`="Europe/Berlin"
             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.

bootstrap.d/12-locale.sh +2 -2

             chroot_exec dpkg-reconfigure -f noninteractive tzdata
             # Install and setup default locale and keyboard configuration
-            if [ "$ENABLE_MINBASE" = false ] ; then
+            if [ $(echo "$APT_INCLUDES" | grep ",locales") ] ; 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
               # ... so we have to set locales manually
                   ;;
               esac
               chroot_exec dpkg-reconfigure -f noninteractive console-setup
-            else # ENABLE_MINBASE=true
+            else # (no locales were installed)
               # Install POSIX default locale
               install_readonly files/locales/locale "${ETCDIR}/default/locale"
             fi

rpi2-gen-image.sh +5 -5

             #!/bin/sh
             ########################################################################
-            # rpi2-gen-image.sh					   ver2a 12/2015
+            # rpi2-gen-image.sh					       2015-2016
             #
             # Advanced debian "jessie" bootstrap script for RPi2
             #
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
-            # some parts based on rpi2-build-image:
+            # Copyright (C) 2015 Jan Wagner <mail@jwagner.eu>
-            # Copyright (C) 2015 Ryan Finnie <ryan@finnie.org>
-            # Copyright (C) 2015 Luca Falavigna <dktrkranz@debian.org>
+            # Big thanks for patches and enhancements by 10+ github contributors!
             ########################################################################
             # Are we running as root?
             trap cleanup 0 1 2 3 6
             # Add required packages for the minbase installation
-            if [ "$ENABLE_MINBASE" = true ] ; then
+            if [ "$ENABLE_MINBASE" = true ]  && [ "$DEFLOCAL" == "en_US.UTF-8" ] ; then
               APT_INCLUDES="${APT_INCLUDES},vim-tiny,netbase,net-tools,ifupdown"
             else
               APT_INCLUDES="${APT_INCLUDES},locales,keyboard-configuration,console-setup"

General Comments 0

Vous devez vous connecter pour laisser un commentaire. Se connecter maintenant

No TODOs yet

	Dépôts
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages