X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=modules%2Fdefault.mk;h=ceb91ff07aee2c7f856a7a62c874991d7a25cffb;hb=c5d6bce2ed4c27cf02077a17ef02c4dee2237e86;hp=5885a38fd0522cd5d1eebb19f83ef6f5aded3ecc;hpb=8a7dd30ff5148e54e3c4a63c675611e557fd0851;p=blast

diff --git a/modules/default.mk b/modules/default.mk
index 5885a38..ceb91ff 100644
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -15,12 +15,19 @@ ${DEBCONF}
 
 keyboard-configuration	keyboard-configuration/model	select	Generic 105-key (Intl) PC
 keyboard-configuration	keyboard-configuration/variant	select	English (US) - English (Macintosh)
+
+console-setup	console-setup/charmap47	select	UTF-8
+console-setup	console-setup/codeset47	select	# Latin1 and Latin5 - western Europe and Turkic languages
 endef
 
+ifndef rpivmem
+  rpivmem := 128
+endif
+
 define RPICONFIG :=
 ${RPICONFIG}
 
-dtoverlay=vc4-fkms-v3d,cma-256
+dtoverlay=vc4-fkms-v3d,cma-${rpivmem}
 endef
 
 .PHONY: _debconf_selections _raspberry_config _keyboard
@@ -42,8 +49,9 @@ _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+)"; \
+	printf '${fstype}\n' >>"$${CFGROOT}/etc/initramfs-tools/modules"
+	k="$$(printf '%s\n' "$${CFGROOT}"/lib/modules/* |sed 's;^.*/;;; /-/d')"; \
+	[ "${kernel}" ] && k="${kernel}"; \
 	chroot $${CFGROOT} update-initramfs -c -k "$${k##*/}"; \
 	printf 'initramfs initrd.img-%s\n' "$${k##*/}" >>"$${CFGROOT}/boot/config.txt"
 
@@ -111,6 +119,12 @@ _hostname: ${CFGROOT}
 	printf '%s\n' "$${hostname}" >"$${CFGROOT}/etc/hostname"
 	sed -Ei "s;^127\.0\.0\.1.*$$;&	$${hostname};" "$${CFGROOT}/etc/hosts"
 
+.PHONY: _systemd_timeout
+_config: _systemd_timeout
+_systemd_timeout: ${CFGROOT}
+	mkdir -p "$${CFGROOT}/etc/systemd"
+	printf 'DefaultTimeout%sSec=%s\n' Start 10s Stop 10s >>"$${CFGROOT}/etc/systemd/system.conf"
+
 ifdef wifi
   _config: ${CFGROOT}/etc/network/interfaces.d/wifi
   ifdef wifipass
@@ -122,6 +136,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-essid %s\n' "$$wifi" >>$@
+	printf '  wireless-essid "%s"\n' "$$wifi" >>$@
   endif
 endif