X-Git-Url: http://git.plutz.net/?p=blast;a=blobdiff_plain;f=modules%2Fdefault.mk;h=0dfe4505208411c22ba08eeb1595143fe39ae249;hp=6282070a5f4cb19fe95687fab62988204884ee77;hb=c907c8177cae158480993fd99134ed2673ac1fa9;hpb=0bbe0a6f3481469600e18ed7cece050d4a67f6ec

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