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

diff --git a/modules/default.mk b/modules/default.mk
index 0dfe450..7c3133f 100644
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -10,15 +10,11 @@ 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	${keyboard}
+keyboard-configuration	keyboard-configuration/variant	select	English (US) - English (Macintosh)
 endef
 
 define RPICONFIG :=
@@ -32,10 +28,11 @@ _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 keyboard
+  _config: _keyboard
+endif
+_keyboard: ${CFGROOT}
+	-sed -Ei 's;^XKBLAYOUT=.*$$;XKBLAYOUT="${keyboard}";;' "$${CFGROOT}/etc/default/keyboard"
 
 ifdef raspi
   _config: _raspberry_config
@@ -105,6 +102,7 @@ _users: ${CFGROOT}
 
 _hostname: ${CFGROOT}
 	printf '%s\n' "$${hostname}" >"$${CFGROOT}/etc/hostname"
+	sed -Ei "s;^127\.0\.0\.1.*$$;&	$${hostname};" "$${CFGROOT}/etc/hosts"
 
 ifdef wifi
   _config: ${CFGROOT}/etc/network/interfaces.d/wifi