Raspi2-3_GenImage Files · bootstrap.d/12-locale.sh · Collaboration Tremplin des Sciences

Correct values of start4.elf /star4.elf that were messed up...

Correct values of start4.elf /star4.elf that were messed up Add some # in comments to ease reading of imbricated if Add the Pi models in comments

Jens - - Load All Authors

Fichier de la dernière révision:

r617:18c8df625662


                r760:b6cf856874ef

Download file

             12-locale.sh
        
                    66 lines
            
             | 2.8 KiB
            
                | application/x-sh
            
             |
                BashLexer
            
             / bootstrap.d / 12-locale.sh
          
                    Historique
                
                 |
                  Source
                 | Brut
                 |Copy content
                 |Copy permalink

        Filip Pytloun
    
Refactor: split bootstrap actions and allow custom

              r56
            
      #

        Jan Wagner
    
spliting more files, fix-uboot, fix-fbturbo, fix-locale

              r67
            
      # Setup Locales and keyboard settings

        Filip Pytloun
    
Refactor: split bootstrap actions and allow custom

              r56
            
      #

        Jan Wagner
    
spliting more files, fix-uboot, fix-fbturbo, fix-locale

              r67
            
      # Load utility functions

        Filip Pytloun
    
Refactor: split bootstrap actions and allow custom

              r56
            
      . ./functions.sh

        Jan Wagner
    
comment-cleanup, net-cleanup, size-calc-fix, split-more, menuconfig

              r71
            
      # Install and setup timezone

        Unknown
    
https://www.shellcheck.net/...

              r336
            
      echo "${TIMEZONE}" > "${ETC_DIR}/timezone"

        Daniel Kraemer
    
Fixed timezone setting

              r593
            
      if [ -f "${ETC_DIR}/localtime" ]; then

          # 1. If 11-apt.sh upgrades the package 'tzdata', '/etc/localtime' was created

          #    because 'dpkg-reconfigure -f noninteractive tzdata' was executed by apt-get.

          # 2. If '/etc/localtime' exists, our execution of 'dpkg-reconfigure -f noninteractive tzdata' 

          #    will ignore the our timezone set in '/etc/timezone'.

          # 3. Removing /etc/localtime will solve this.

          rm -f "${ETC_DIR}/localtime"

      fi

        Filip Pytloun
    
Refactor: split bootstrap actions and allow custom

              r56
            
      chroot_exec dpkg-reconfigure -f noninteractive tzdata

        Jan Wagner
    
comment-cleanup, net-cleanup, size-calc-fix, split-more, menuconfig

              r71
            
      # Install and setup default locale and keyboard configuration

        Unknown
    
https://www.shellcheck.net/...

              r336
            
      if [ "$(echo "$APT_INCLUDES" | grep ",locales")" ] ; then

        Filip Pytloun
    
Refactor: split bootstrap actions and allow custom

              r56
            
        # 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

        if [ "$DEFLOCAL" = "en_US.UTF-8" ] ; then

        Jens
    
do set in chroot not on host system...

              r617
            
          chroot_exec echo "locales locales/locales_to_be_generated multiselect ${DEFLOCAL} UTF-8 | debconf-set-selections"

        Filip Pytloun
    
Refactor: split bootstrap actions and allow custom

              r56
            
        else

          # en_US.UTF-8 should be available anyway : https://www.debian.org/doc/manuals/debian-reference/ch08.en.html#_the_reconfiguration_of_the_locale

        Jens
    
do set in chroot not on host system...

              r617
            
          chroot_exec echo "locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8, ${DEFLOCAL} UTF-8 | debconf-set-selections"

        drtyhlpr
    
Added Raspberry Pi 3 model support

              r94
            
          sed -i "/en_US.UTF-8/s/^#//" "${ETC_DIR}/locale.gen"

        Filip Pytloun
    
Refactor: split bootstrap actions and allow custom

              r56
            
        fi

        Jan Wagner
    
spliting more files, fix-uboot, fix-fbturbo, fix-locale

              r67
            
        drtyhlpr
    
Added Raspberry Pi 3 model support

              r94
            
        sed -i "/${DEFLOCAL}/s/^#//" "${ETC_DIR}/locale.gen"

        Jens
    
do set in chroot not on host system...

              r617
            
        chroot_exec echo "locales locales/default_environment_locale select ${DEFLOCAL} | debconf-set-selections"

        Filip Pytloun
    
Refactor: split bootstrap actions and allow custom

              r56
            
        chroot_exec locale-gen

        Jan Wagner
    
Added: KERNELSRC_PREBUILT, KERNELSRC_ rename, fix-quotes

              r75
            
        chroot_exec update-locale LANG="${DEFLOCAL}"

        Filip Pytloun
    
Refactor: split bootstrap actions and allow custom

              r56
            
        Jan Wagner
    
comment-cleanup, net-cleanup, size-calc-fix, split-more, menuconfig

              r71
            
        # Install and setup default keyboard configuration

        Unknown
    
- removed wrong/old logic for locales...

              r431
            
        if [ "$XKB_MODEL" != "" ] ; then

        drtyhlpr
    
Added Raspberry Pi 3 model support

              r94
            
          sed -i "s/^XKBMODEL.*/XKBMODEL=\"${XKB_MODEL}\"/" "${ETC_DIR}/default/keyboard"

        Filip Pytloun
    
Refactor: split bootstrap actions and allow custom

              r56
            
        fi

        Unknown
    
- removed wrong/old logic for locales...

              r431
            
        if [ "$XKB_LAYOUT" != "" ] ; then

        drtyhlpr
    
Added Raspberry Pi 3 model support

              r94
            
          sed -i "s/^XKBLAYOUT.*/XKBLAYOUT=\"${XKB_LAYOUT}\"/" "${ETC_DIR}/default/keyboard"

        Filip Pytloun
    
Refactor: split bootstrap actions and allow custom

              r56
            
        fi

        Jan Wagner
    
spliting more files, fix-uboot, fix-fbturbo, fix-locale

              r67
            
        if [ "$XKB_VARIANT" != "" ] ; then

        drtyhlpr
    
Added Raspberry Pi 3 model support

              r94
            
          sed -i "s/^XKBVARIANT.*/XKBVARIANT=\"${XKB_VARIANT}\"/" "${ETC_DIR}/default/keyboard"

        Filip Pytloun
    
Refactor: split bootstrap actions and allow custom

              r56
            
        fi

        Jan Wagner
    
spliting more files, fix-uboot, fix-fbturbo, fix-locale

              r67
            
        if [ "$XKB_OPTIONS" != "" ] ; then

        drtyhlpr
    
Added Raspberry Pi 3 model support

              r94
            
          sed -i "s/^XKBOPTIONS.*/XKBOPTIONS=\"${XKB_OPTIONS}\"/" "${ETC_DIR}/default/keyboard"

        Filip Pytloun
    
Refactor: split bootstrap actions and allow custom

              r56
            
        fi

        chroot_exec dpkg-reconfigure -f noninteractive keyboard-configuration

        Jan Wagner
    
spliting more files, fix-uboot, fix-fbturbo, fix-locale

              r67
            
        Jan Wagner
    
comment-cleanup, net-cleanup, size-calc-fix, split-more, menuconfig

              r71
            
        # Install and setup font console

        Filip Pytloun
    
Refactor: split bootstrap actions and allow custom

              r56
            
        case "${DEFLOCAL}" in

          *UTF-8)

        drtyhlpr
    
Added Raspberry Pi 3 model support

              r94
            
            sed -i 's/^CHARMAP.*/CHARMAP="UTF-8"/' "${ETC_DIR}/default/console-setup"

        Filip Pytloun
    
Refactor: split bootstrap actions and allow custom

              r56
            
            ;;

          *)

        drtyhlpr
    
Added Raspberry Pi 3 model support

              r94
            
            sed -i 's/^CHARMAP.*/CHARMAP="guess"/' "${ETC_DIR}/default/console-setup"

        Filip Pytloun
    
Refactor: split bootstrap actions and allow custom

              r56
            
            ;;

        esac

        chroot_exec dpkg-reconfigure -f noninteractive console-setup

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

              r88
            
      else # (no locales were installed)

        Jan Wagner
    
comment-cleanup, net-cleanup, size-calc-fix, split-more, menuconfig

              r71
            
        # Install POSIX default locale

        drtyhlpr
    
Added Raspberry Pi 3 model support

              r94
            
        install_readonly files/locales/locale "${ETC_DIR}/default/locale"

        Filip Pytloun
    
Refactor: split bootstrap actions and allow custom

              r56
            
      fi

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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

Filip Pytloun Refactor: split bootstrap actions and allow custom	r56	#
Jan Wagner spliting more files, fix-uboot, fix-fbturbo, fix-locale	r67	# Setup Locales and keyboard settings
Filip Pytloun Refactor: split bootstrap actions and allow custom	r56	#

Jan Wagner spliting more files, fix-uboot, fix-fbturbo, fix-locale	r67	# Load utility functions
Filip Pytloun Refactor: split bootstrap actions and allow custom	r56	. ./functions.sh

Jan Wagner comment-cleanup, net-cleanup, size-calc-fix, split-more, menuconfig	r71	# Install and setup timezone
Unknown https://www.shellcheck.net/...	r336	echo "${TIMEZONE}" > "${ETC_DIR}/timezone"
Daniel Kraemer Fixed timezone setting	r593	if [ -f "${ETC_DIR}/localtime" ]; then
		# 1. If 11-apt.sh upgrades the package 'tzdata', '/etc/localtime' was created
		# because 'dpkg-reconfigure -f noninteractive tzdata' was executed by apt-get.
		# 2. If '/etc/localtime' exists, our execution of 'dpkg-reconfigure -f noninteractive tzdata'
		# will ignore the our timezone set in '/etc/timezone'.
		# 3. Removing /etc/localtime will solve this.
		rm -f "${ETC_DIR}/localtime"
		fi
Filip Pytloun Refactor: split bootstrap actions and allow custom	r56	chroot_exec dpkg-reconfigure -f noninteractive tzdata

Jan Wagner comment-cleanup, net-cleanup, size-calc-fix, split-more, menuconfig	r71	# Install and setup default locale and keyboard configuration
Unknown https://www.shellcheck.net/...	r336	if [ "$(echo "$APT_INCLUDES" \| grep ",locales")" ] ; then
Filip Pytloun Refactor: split bootstrap actions and allow custom	r56	# 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
		if [ "$DEFLOCAL" = "en_US.UTF-8" ] ; then
Jens do set in chroot not on host system...	r617	chroot_exec echo "locales locales/locales_to_be_generated multiselect ${DEFLOCAL} UTF-8 \| debconf-set-selections"
Filip Pytloun Refactor: split bootstrap actions and allow custom	r56	else
		# en_US.UTF-8 should be available anyway : https://www.debian.org/doc/manuals/debian-reference/ch08.en.html#_the_reconfiguration_of_the_locale
Jens do set in chroot not on host system...	r617	chroot_exec echo "locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8, ${DEFLOCAL} UTF-8 \| debconf-set-selections"
drtyhlpr Added Raspberry Pi 3 model support	r94	sed -i "/en_US.UTF-8/s/^#//" "${ETC_DIR}/locale.gen"
Filip Pytloun Refactor: split bootstrap actions and allow custom	r56	fi
Jan Wagner spliting more files, fix-uboot, fix-fbturbo, fix-locale	r67
drtyhlpr Added Raspberry Pi 3 model support	r94	sed -i "/${DEFLOCAL}/s/^#//" "${ETC_DIR}/locale.gen"
Jens do set in chroot not on host system...	r617	chroot_exec echo "locales locales/default_environment_locale select ${DEFLOCAL} \| debconf-set-selections"
Filip Pytloun Refactor: split bootstrap actions and allow custom	r56	chroot_exec locale-gen
Jan Wagner Added: KERNELSRC_PREBUILT, KERNELSRC_ rename, fix-quotes	r75	chroot_exec update-locale LANG="${DEFLOCAL}"
Filip Pytloun Refactor: split bootstrap actions and allow custom	r56
Jan Wagner comment-cleanup, net-cleanup, size-calc-fix, split-more, menuconfig	r71	# Install and setup default keyboard configuration
Unknown - removed wrong/old logic for locales...	r431	if [ "$XKB_MODEL" != "" ] ; then
drtyhlpr Added Raspberry Pi 3 model support	r94	sed -i "s/^XKBMODEL.*/XKBMODEL=\"${XKB_MODEL}\"/" "${ETC_DIR}/default/keyboard"
Filip Pytloun Refactor: split bootstrap actions and allow custom	r56	fi
Unknown - removed wrong/old logic for locales...	r431	if [ "$XKB_LAYOUT" != "" ] ; then
drtyhlpr Added Raspberry Pi 3 model support	r94	sed -i "s/^XKBLAYOUT.*/XKBLAYOUT=\"${XKB_LAYOUT}\"/" "${ETC_DIR}/default/keyboard"
Filip Pytloun Refactor: split bootstrap actions and allow custom	r56	fi
Jan Wagner spliting more files, fix-uboot, fix-fbturbo, fix-locale	r67	if [ "$XKB_VARIANT" != "" ] ; then
drtyhlpr Added Raspberry Pi 3 model support	r94	sed -i "s/^XKBVARIANT.*/XKBVARIANT=\"${XKB_VARIANT}\"/" "${ETC_DIR}/default/keyboard"
Filip Pytloun Refactor: split bootstrap actions and allow custom	r56	fi
Jan Wagner spliting more files, fix-uboot, fix-fbturbo, fix-locale	r67	if [ "$XKB_OPTIONS" != "" ] ; then
drtyhlpr Added Raspberry Pi 3 model support	r94	sed -i "s/^XKBOPTIONS.*/XKBOPTIONS=\"${XKB_OPTIONS}\"/" "${ETC_DIR}/default/keyboard"
Filip Pytloun Refactor: split bootstrap actions and allow custom	r56	fi
		chroot_exec dpkg-reconfigure -f noninteractive keyboard-configuration
Jan Wagner spliting more files, fix-uboot, fix-fbturbo, fix-locale	r67
Jan Wagner comment-cleanup, net-cleanup, size-calc-fix, split-more, menuconfig	r71	# Install and setup font console
Filip Pytloun Refactor: split bootstrap actions and allow custom	r56	case "${DEFLOCAL}" in
		*UTF-8)
drtyhlpr Added Raspberry Pi 3 model support	r94	sed -i 's/^CHARMAP.*/CHARMAP="UTF-8"/' "${ETC_DIR}/default/console-setup"
Filip Pytloun Refactor: split bootstrap actions and allow custom	r56	;;
		*)
drtyhlpr Added Raspberry Pi 3 model support	r94	sed -i 's/^CHARMAP.*/CHARMAP="guess"/' "${ETC_DIR}/default/console-setup"
Filip Pytloun Refactor: split bootstrap actions and allow custom	r56	;;
		esac
		chroot_exec dpkg-reconfigure -f noninteractive console-setup
drtyhlpr Fixed: DEFLOCAL now works with MINBASE, author added on request	r88	else # (no locales were installed)
Jan Wagner comment-cleanup, net-cleanup, size-calc-fix, split-more, menuconfig	r71	# Install POSIX default locale
drtyhlpr Added Raspberry Pi 3 model support	r94	install_readonly files/locales/locale "${ETC_DIR}/default/locale"
Filip Pytloun Refactor: split bootstrap actions and allow custom	r56	fi