Merge branch 'main' of ssh://imaginaerraum.de:2201/apo/DoorPi into main

This commit is contained in:
Simon Pirkelmann 2021-03-21 18:23:32 +01:00
commit 1478e6fdb1
2 changed files with 4 additions and 3 deletions

View File

@ -34,8 +34,7 @@ root_overlay/bin/door.py: door_control/door.py
cp $< $@
root_overlay/etc/dropbear/dropbear_ecdsa_host_key:
mkdir -p `dirname $@`
ssh-keygen -t ecdsa -f $@
sh -c 'if [[ ! -f $@ && ! -f $@.openssh ]]; then mkdir -p `dirname $@` && ssh-keygen -t ecdsa -f $@.openssh; fi'
root_overlay/etc/wpa_supplicant/wpa_supplicant.conf:
mkdir -p `dirname $@`
@ -51,4 +50,4 @@ clean:
menuconfig:
make -C buildroot menuconfig
.PHONY: all clean sdcard.img menuconfig root_overlay
.PHONY: all clean sdcard.img menuconfig root_overlay root_overlay/etc/dropbear/dropbear_ecdsa_host_key

View File

@ -0,0 +1,2 @@
#!/bin/sh
[[ ! -f /etc/dropbear/dropbear_ecdsa_host_key && -f /etc/dropbear/host_key ]] && dropbearconvert openssh dropbear /etc/dropbear/host_key /etc/dropbear/dropbear_ecdsa_host_key