X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=modules%2Fdefault.mk;h=6a1907a93cb6eaec01a4c278f4d69b3448bc4ff9;hb=8f8245c28a82c900e1de7240f81682c0d7f3fa04;hp=a0e88a2e1b52b99f352edbe3a59048e22d2e206c;hpb=7bceaf33e56a24fe214f13582cf352244e1e5d0b;p=blast

diff --git a/modules/default.mk b/modules/default.mk
index a0e88a2..6a1907a 100644
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -2,7 +2,7 @@ ifdef imagesize
   ROOT_MB := $(shell printf '%i\n' "$$(( ${imagesize} - ${BOOT_MB} - 3 ))")
 endif
 
-PACKAGES += btrfs-tools bzip2 ca-certificates cron deborphan firmware-linux-free gzip htop ifupdown iputils-ping irqbalance isc-dhcp-client less make net-tools nmap ntpdate openssh-client psmisc rsync sshfs sudo traceroute unzip vim wget wireless-tools wpasupplicant xz-utils zip
+PACKAGES += btrfs-progs bzip2 ca-certificates cron deborphan firmware-linux-free gzip htop ifupdown iputils-ping irqbalance isc-dhcp-client less make net-tools nmap ntpdate openssh-client psmisc rsync sshfs sudo traceroute unzip vim wget wireless-tools wpasupplicant xz-utils zip
 
 ifdef packages
   PACKAGES += $(subst ${comma_},${space_},${packages})
@@ -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
@@ -83,7 +89,7 @@ _rootpass: ${CFGROOT}
 	chroot "$${CFGROOT}" usermod -p "$$(openssl passwd "$${rootpass}")" root
 
 ${rootkey}.pub:
-	ssh-keygen -N '' -f "$${rootkey}"
+	[ -f "$@" ] || ssh-keygen -N '' -f "$${rootkey}"
 
 _rootkey: ${CFGROOT} ${rootkey}.pub
 	mkdir -m 700 "$${CFGROOT}/root/.ssh/"