Raspi2-3_GenImage Commit - r27:16487517311f · Collaboration Tremplin des Sciences

Added support for keyboard configuration

Vincent Knecht -

r27:16487517311f

parent child

Context file:

r27:16487517311f

Collapse all files

README.md +9 -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 and keyboard layout. 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. The script variant `minbase` (ENABLE_MINBASE=true) doesn't install `locales`.
             ##### `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.
+            #### Keyboard settings:
+            These options are used to configure keyboard layout in `/etc/default/keyboard` for console and Xorg. These settings can also be changed inside the running OS using the `dpkg-reconfigure keyboard-configuration` command.
+            ##### `XKBMODEL`=""
+            ##### `XKBLAYOUT`=""
+            ##### `XKBVARIANT`=""
+            ##### `XKBOPTIONS`=""
             #### Basic system features:
             ##### `ENABLE_CONSOLE`=true
             Enable serial console interface. Recommended if no monitor or keyboard is connected to the RPi2. In case of problems fe. if the network (auto) configuration failed - the serial console can be used to access the system.

rpi2-gen-image.sh +31 -2

             PASSWORD=${PASSWORD:=raspberry}
             DEFLOCAL=${DEFLOCAL:="en_US.UTF-8"}
             TIMEZONE=${TIMEZONE:="Europe/Berlin"}
+            XKBMODEL=${XKBMODEL:=""}
+            XKBLAYOUT=${XKBLAYOUT:=""}
+            XKBVARIANT=${XKBVARIANT:=""}
+            XKBOPTIONS=${XKBOPTIONS:=""}
             # APT settings
             APT_PROXY=${APT_PROXY:=""}
             if [ "$ENABLE_MINBASE" = true ] ; then
               APT_INCLUDES="${APT_INCLUDES},vim-tiny,netbase,net-tools"
             else
-              APT_INCLUDES="${APT_INCLUDES},locales"
+              APT_INCLUDES="${APT_INCLUDES},locales,keyboard-configuration,console-setup"
             fi
             # Add dbus package, recommended if using systemd
             LANG=C chroot $R apt-get -qq -y update
             LANG=C chroot $R apt-get -qq -y -u dist-upgrade
-            # Set up default locales to "en_US.UTF-8" default
+            # Set up default locale and keyboard configuration
             if [ "$ENABLE_MINBASE" = false ] ; 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
               LANG=C chroot $R echo "locales locales/default_environment_locale select ${DEFLOCAL}" | debconf-set-selections
               LANG=C chroot $R locale-gen
               LANG=C chroot $R update-locale LANG=${DEFLOCAL}
+              # Keyboard configuration, if requested
+              if [ "$XKBMODEL" != "" ] ; then
+                LANG=C chroot $R sed -i "s/^XKBMODEL.*/XKBMODEL=\"${XKBMODEL}\"/" /etc/default/keyboard
+              fi
+              if [ "$XKBLAYOUT" != "" ] ; then
+                LANG=C chroot $R sed -i "s/^XKBLAYOUT.*/XKBLAYOUT=\"${XKBLAYOUT}\"/" /etc/default/keyboard
+              fi
+              if [ "$XKBVARIANT" != "" ] ; then
+                LANG=C chroot $R sed -i "s/^XKBVARIANT.*/XKBVARIANT=\"${XKBVARIANT}\"/" /etc/default/keyboard
+              fi
+              if [ "$XKBOPTIONS" != "" ] ; then
+                LANG=C chroot $R sed -i "s/^XKBOPTIONS.*/XKBOPTIONS=\"${XKBOPTIONS}\"/" /etc/default/keyboard
+              fi
+              LANG=C chroot $R dpkg-reconfigure -f noninteractive keyboard-configuration
+              # Set up font console
+              case "${DEFLOCAL}" in
+                *UTF-8)
+                  LANG=C chroot $R sed -i 's/^CHARMAP.*/CHARMAP="UTF-8"/' /etc/default/console-setup
+                  ;;
+                *)
+                  LANG=C chroot $R sed -i 's/^CHARMAP.*/CHARMAP="guess"/' /etc/default/console-setup
+                  ;;
+              esac
+              LANG=C chroot $R dpkg-reconfigure -f noninteractive console-setup
             fi
             # Kernel installation

General Comments 0

Écrire
Preview

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

No TODOs yet

	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