diff --git a/config/hooks/live/0022_dropbear_setup.chroot b/config/hooks/live/0022_dropbear_setup.chroot index 7ef7f7d..f2b4d1c 100644 --- a/config/hooks/live/0022_dropbear_setup.chroot +++ b/config/hooks/live/0022_dropbear_setup.chroot @@ -10,6 +10,7 @@ # SPDX-PackageName: CISS.debian.live.builder # SPDX-Security-Contact: security@coresecret.eu set -Ceuo pipefail +set -x printf "\e[95m++++ ++++ ++++ ++++ ++++ ++++ ++ 🧪 '%s' starting ... \e[0m\n" "${0}" @@ -36,17 +37,8 @@ dropbear_setup() { if [[ -d /root/ssh ]]; then - # shellcheck disable=SC2155 - declare _tmp=$(mktemp) - cp -f -- /root/ssh/ssh_host_rsa_key "${_tmp}" - ssh-keygen -p -N '' -m PEM -f "${_tmp}" - dropbearconvert openssh dropbear /root/ssh/ssh_host_ed25519_key /etc/dropbear/initramfs/dropbear_ed25519_host_key - dropbearconvert openssh dropbear "${_tmp}" /etc/dropbear/initramfs/dropbear_rsa_host_key dropbearkey -y -f /etc/dropbear/initramfs/dropbear_ed25519_host_key /etc/dropbear/initramfs/dropbear_ed25519_host_key.pub - dropbearkey -y -f /etc/dropbear/initramfs/dropbear_rsa_host_key /etc/dropbear/initramfs/dropbear_rsa_host_key.pub - - rm -f "${_tmp}" else @@ -54,7 +46,7 @@ dropbear_setup() { /usr/bin/dropbearkey -t ed25519 -f /etc/dropbear/initramfs/dropbear_ed25519_host_key -C "root@live-$(date -I)" # shellcheck disable=SC2312 - /usr/bin/dropbearkey -t rsa -s 4096 -f /etc/dropbear/initramfs/dropbear_rsa_host_key -C "root@live-$(date -I)" + /usr/bin/dropbearkey -t rsa -s 4096 -f /etc/dropbear/initramfs/dropbear_rsa_host_key -C "root@live-$(date -I)" fi