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

diff --git a/modules/default.mk b/modules/default.mk
index 0dfe450..f93fd24 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,17 +28,25 @@ _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
+  _config: _raspberry_config _raspberry_initrd
 endif
+
 _raspberry_config: ${CFGROOT}
 	printf '%s\n' "$${RPICONFIG}" >>"$${CFGROOT}/boot/config.txt"
 
+_raspberry_initrd: ${CFGROOT}
+	printf 'nilfs2\n' >>"$${CFGROOT}/etc/initramfs-tools/modules"
+	k="$$(echo "$${CFGROOT}"/lib/modules/*-v7+)"; \
+	chroot $${CFGROOT} update-initramfs -c -k "$${k##*/}"; \
+	printf 'initramfs initrd.img-%s\n' "$${k##*/}" >>"$${CFGROOT}/boot/config.txt"
+
 .PHONY: _timezone _locales
 
 ifdef timezone
@@ -105,6 +109,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
@@ -117,6 +122,6 @@ ifdef wifi
     export wifi
     ${CFGROOT}/etc/network/interfaces.d/wifi: ${CFGROOT}
 	printf 'auto wlan0\nallow-hotplug wlan0\n\niface wlan0 inet dhcp\n' >$@
-	printf '  wireless-ssid "%s"\n' "$$wifi" >>$@
+	printf '  wireless-essid "%s"\n' "$$wifi" >>$@
   endif
 endif