From c907c8177cae158480993fd99134ed2673ac1fa9 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Paul=20H=C3=A4nsch?= <paul@plutz.net>
Date: Thu, 19 Sep 2019 12:54:15 +0200
Subject: [PATCH] Config option for keyboard layout

---
 config.example     |  4 ++++
 modules/default.mk | 13 +++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/config.example b/config.example
index 33064de..5aee804 100644
--- a/config.example
+++ b/config.example
@@ -42,6 +42,10 @@
 ## Comma separated list of locales, first one will become default locale
 # locales=de_DE.UTF-8,en_US.UTF-8
 
+## Keyboard as used in debconfs keyboard-configuration/variant
+## Use debconf-get-selections to find out the exact string
+# keyboard=German
+
 ## If nodm is installed, you can choose a user to login automatically
 ## If no user is given here, then nodm will default to root
 # nodm_user=adam
diff --git a/modules/default.mk b/modules/default.mk
index 6282070..0dfe450 100644
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -10,11 +10,15 @@ endif
 
 export DEBCONF RPICONFIG
 
+ifndef keyboard
+keyboard := English (US) - English (Macintosh)
+endif
+
 define DEBCONF :=
 ${DEBCONF}
 
 keyboard-configuration	keyboard-configuration/model	select	Generic 105-key (Intl) PC
-keyboard-configuration	keyboard-configuration/variant	select	English (US) - English (Macintosh)
+keyboard-configuration	keyboard-configuration/variant	select	${keyboard}
 endef
 
 define RPICONFIG :=
@@ -23,11 +27,16 @@ ${RPICONFIG}
 dtoverlay=vc4-fkms-v3d,cma-256
 endef
 
-.PHONY: _debconf_selections _raspberry_config
+.PHONY: _debconf_selections _raspberry_config _keyboard
 _install: _debconf_selections
 _debconf_selections: ${SYSROOT}
 	printf '%s\n' "$${DEBCONF}" |chroot "$${SYSROOT}" debconf-set-selections
 
+_config: _keyboard
+_keyboard: ${CFGROOT} _debconf_selections
+	rm "$${CFGROOT}/etc/default/keyboard"
+	chroot "$${CFGROOT}" dpkg-reconfigure --default-priority -u keyboard-configuration
+
 ifdef raspi
   _config: _raspberry_config
 endif
-- 
2.39.2