avoid regenerating existing ssh key

[blast] / modules / default.mk

diff --git a/modules/default.mk b/modules/default.mk
index 5a21e36d22f5ab94599489f94f86ea5c751c8ab1..6b1f08e13d293e93c490db8337ce348ca8b86968 100644 (file)
--- a/modules/default.mk
+++ b/modules/default.mk
@@ -20,7 +20,7 @@ endef
 define RPICONFIG :=
 ${RPICONFIG}
 
-dtoverlay=vc4-fkms-v3d,cma-128
+dtoverlay=vc4-fkms-v3d,cma-256
 endef
 
 .PHONY: _debconf_selections _raspberry_config
@@ -83,7 +83,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/"
@@ -91,7 +91,7 @@ _rootkey: ${CFGROOT} ${rootkey}.pub
 
 _users: ${CFGROOT}
        for u in $(subst ${comma_},${space_},${users}); do \
-               chroot "$${CFGROOT}" useradd -m -s /bin/bash -p "$$(openssl passwd "")" "$$u"; \
+               chroot "$${CFGROOT}" useradd -s /bin/bash -p "$$(openssl passwd "")" "$$u"; \
        done
 
 _hostname: ${CFGROOT}