fixes from live-image branch

[blast] / modules / default.mk

diff --git a/modules/default.mk b/modules/default.mk
index 6282070a5f4cb19fe95687fab62988204884ee77..4bacb5ca6880fcb586efe774a33d065e811fe386 100644 (file)
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -23,11 +23,17 @@ ${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
 
+ifdef keyboard
+  _config: _keyboard
+endif
+_keyboard: ${CFGROOT}
+       sed -Ei 's;^XKBLAYOUT=.*$$;XKBLAYOUT="${keyboard}";;' "$${CFGROOT}/etc/default/keyboard"
+
 ifdef raspi
   _config: _raspberry_config
 endif