Merge pull request #15 from vknecht/locale-fix

Fixed DEFLOCAL shell var substitution while sed-ing /etc/locale.gen / thx

2 files changed, 57 insertions, 8 deletions

diff --git a/README.md b/README.md
index fddf17d..987ce62 100644
--- a/README.md
+++ b/README.md
@@ -35,11 +35,19 @@ Set system host name. It's recommended that the host name is unique in the corre
 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.
diff --git a/rpi2-gen-image.sh b/rpi2-gen-image.sh
index cce740b..6c27a4b 100755
--- a/rpi2-gen-image.sh
+++ b/rpi2-gen-image.sh
@@ -45,6 +45,10 @@ HOSTNAME=${HOSTNAME:=rpi2-${RELEASE}}
 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:=""}
@@ -128,7 +132,7 @@ mkdir -p $R
 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
@@ -218,12 +222,6 @@ EOM
 echo ${TIMEZONE} >$R/etc/timezone
 LANG=C chroot $R dpkg-reconfigure -f noninteractive tzdata
 
-# Set up default locales to "en_US.UTF-8" default
-if [ "$ENABLE_MINBASE" = false ] ; then
-  LANG=C chroot $R sed -i '/${DEFLOCAL}/s/^#//' /etc/locale.gen
-  LANG=C chroot $R locale-gen ${DEFLOCAL}
-fi
-
 # Upgrade collabora package index and install collabora keyring
 echo "deb https://repositories.collabora.co.uk/debian ${RELEASE} rpi2" >$R/etc/apt/sources.list
 LANG=C chroot $R apt-get -qq -y update
@@ -247,6 +245,49 @@ EOM
 LANG=C chroot $R apt-get -qq -y update
 LANG=C chroot $R apt-get -qq -y -u dist-upgrade
 
+# 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
+  # ... so we have to set locales manually
+  if [ "$DEFLOCAL" = "en_US.UTF-8" ] ; then
+    LANG=C chroot $R echo "locales locales/locales_to_be_generated multiselect ${DEFLOCAL} UTF-8" | debconf-set-selections
+  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
+    LANG=C chroot $R echo "locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8, ${DEFLOCAL} UTF-8" | debconf-set-selections
+    LANG=C chroot $R sed -i "/en_US.UTF-8/s/^#//" /etc/locale.gen
+  fi
+  LANG=C chroot $R sed -i "/${DEFLOCAL}/s/^#//" /etc/locale.gen
+  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
 # Install flash-kernel last so it doesn't try (and fail) to detect the platform in the chroot
 LANG=C chroot $R apt-get -qq -y --no-install-recommends install linux-image-3.18.0-trunk-rpi2