From 3a60297bef94103f049da079c6eb0d5165a5866f Mon Sep 17 00:00:00 2001 From: lub Date: Fri, 11 Aug 2023 16:36:06 +0200 Subject: [PATCH] Revert "only use rsa keys for dropbear" This reverts commit 7eb3bb228f1bc4f4bd3422955f7c4f6cd46495ad. --- README.md | 3 +-- authorized_keys_dropbear/lub | 1 - post-debootstrap-installer.sh | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 authorized_keys_dropbear/lub diff --git a/README.md b/README.md index 681a2af..ed87fbc 100644 --- a/README.md +++ b/README.md @@ -34,5 +34,4 @@ Templates (`hardware/*`) consist of three files: `config/*` gets copied to the chroot and contains static config files -`authorized_keys/*` is used to create the users and populate their respective `~/.ssh/authorized_keys` -`authorized_keys_dropbear/*` is allowed to login for fde unlocking. No ed25519 keys supported.` +`authorized_keys/*` is used to create the users and populate their respective `~/.ssh/authorized_keys` \ No newline at end of file diff --git a/authorized_keys_dropbear/lub b/authorized_keys_dropbear/lub deleted file mode 100644 index bfb7b05..0000000 --- a/authorized_keys_dropbear/lub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCoCfs2IBe/6bzJs7eD6+a6jLpWt3PtfLiwd/nqsN9h4fc15qws2LlTg3rPwjxNJfGdYXB2CJHSMMIzvsNK3HBEagt/iBc8hV9qRHT6jLZqBJ0B2tXTQkawHizC0LP0gKGbH9aXPFaY29W/Xa+igNxsjDv9rZh0QaSa/3Z2nxzjJT4kwIXdwonREULtthsY5PnfyV/Qwe8pgbMPrSxq+rlsriGtU9Yr5qck5myK9/O+q8gQBTkbjGstPLRlDX37DDgHh9haQJ4yvGEy8p0akSdloQ9SgbISsZx+tdq9cB0TzRDY+YB2hVUrtBVhdcZ0HpDDv8J1GtkrUTfClnI6GNrkoBiJ6p2VgB0dzNQBIeuhvvzJPVmEAsi84FjwktdMx3IrrUJ1xgWftTOcZ2rxX4+vDCdr4NH1sAn9jqEUE28D1ouRwvMkyyPSictJ22CWaG4fSPfDlzylKRWFLkEPcKi06CAF8B9cGsoFGjEyiQ08lhHPHqQc1Gi2SBSXYE509wFNi385om61JY94izXAXAPx+n4OcpksEQangkBIYl0ZLyBRplQgqgzF/pCl59uosdGXjtEmOXxsYrdDmGnXCLInkA8N/bx6jZ6svGiaSXtKI/P6hY3MALuF37KzsMSNhnX6fG/a3l3WV4QYGgTtEPuYoYPpLnElMzM/MqHGEqcE/Q== lub diff --git a/post-debootstrap-installer.sh b/post-debootstrap-installer.sh index 4d5d7f3..62088d7 100755 --- a/post-debootstrap-installer.sh +++ b/post-debootstrap-installer.sh @@ -33,7 +33,7 @@ apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-conf mdadm --examine --scan | perl -pe 's/.*\/dev\/md\/?([0-9]+) .*UUID\=(.+?) .*/ARRAY \/dev\/md$1 UUID=$2/' > /etc/mdadm/mdadm.conf # concat user keys for cryptsetup unlocking at boot -cat /hardware-setup/authorized_keys_dropbear/* > /etc/dropbear-initramfs/authorized_keys +cat /hardware-setup/authorized_keys/* > /etc/dropbear-initramfs/authorized_keys # install grub if [ -d /sys/firmware/efi ]; then