X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=modules%2Fdefault.mk;h=7719ce4d484bc33423df543240e745650491a820;hb=9b41121078e861ebef38cd8d3659b88d73cb206a;hp=6282070a5f4cb19fe95687fab62988204884ee77;hpb=b136fd10a1cc4d68130cd68c57696fd9664f0097;p=blast

diff --git a/modules/default.mk b/modules/default.mk
index 6282070..7719ce4 100644
--- 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
@@ -96,6 +102,7 @@ _users: ${CFGROOT}
 
 _hostname: ${CFGROOT}
 	printf '%s\n' "$${hostname}" >"$${CFGROOT}/etc/hostname"
+	sed -Ei "s;^127\.0\.0\.1.*$$;\1	$${hostname};" "$${CFGROOT}/etc/hosts"
 
 ifdef wifi
   _config: ${CFGROOT}/etc/network/interfaces.d/wifi