diff --git a/authorized_keys/lub b/authorized_keys/lub index 0aa74ce..9e8ece6 100644 --- a/authorized_keys/lub +++ b/authorized_keys/lub @@ -1,2 +1,2 @@ -sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAINQ0EPy3cbfX/wmelSsjRvrXpq9kZWo8tRh68r4Z3QhTAAAABHNzaDo= lub@primary -sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIAUmJxFSwI95zf/NBKNMDXyiRViuKsWnVYl3Qd3DXdRWAAAABHNzaDo= lub@secondary +sk-ssh-ed25519 AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAINQ0EPy3cbfX/wmelSsjRvrXpq9kZWo8tRh68r4Z3QhTAAAABHNzaDo= lub@primary +sk-ssh-ed25519 AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIAUmJxFSwI95zf/NBKNMDXyiRViuKsWnVYl3Qd3DXdRWAAAABHNzaDo= lub@secondary diff --git a/config/etc/dropbear-initramfs/config b/config/etc/dropbear-initramfs/config deleted file mode 100644 index 318b34d..0000000 --- a/config/etc/dropbear-initramfs/config +++ /dev/null @@ -1 +0,0 @@ -DROPBEAR_OPTIONS="-p 222" \ No newline at end of file diff --git a/config/etc/dropbear/initramfs/dropbear.conf b/config/etc/dropbear/initramfs/dropbear.conf new file mode 100644 index 0000000..19ff6b8 --- /dev/null +++ b/config/etc/dropbear/initramfs/dropbear.conf @@ -0,0 +1 @@ +DROPBEAR_PORT=222 diff --git a/post-debootstrap-installer.sh b/post-debootstrap-installer.sh index 62088d7..565e15e 100755 --- a/post-debootstrap-installer.sh +++ b/post-debootstrap-installer.sh @@ -26,14 +26,14 @@ apt-get -y install locales apt-get -y install mdadm cryptsetup systemd systemd-sysv firmware-linux systemctl enable fstrim.timer -# --force-confold because we already provide /etc/dropbear-initramfs/config +# --force-confold because we already provide /etc/dropbear/initramfs/dropbear.conf apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" install dropbear-initramfs # generate minimal mdadm.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/* > /etc/dropbear-initramfs/authorized_keys +cat /hardware-setup/authorized_keys/* > /etc/dropbear/initramfs/authorized_keys # install grub if [ -d /sys/firmware/efi ]; then