Merge remote-tracking branch 'origin/master' into next

[ipfire-2.x.git] / config / rootfiles / oldcore / 94 / update.sh

diff --git a/config/rootfiles/oldcore/94/update.sh b/config/rootfiles/oldcore/94/update.sh
index a9c24a5f8344b712cbe35950cae6ea3bd90ab706..99aa04659c11526998f689c0322056ff55bf05e9 100644 (file)
--- a/config/rootfiles/oldcore/94/update.sh
+++ b/config/rootfiles/oldcore/94/update.sh
@@ -48,9 +48,10 @@ telinit u
 # Update SSH configuration
 sed -i /etc/ssh/sshd_config \
        -e 's/^#PermitRootLogin yes$/PermitRootLogin yes/' \
-       -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$|HostKey /etc/ssh/ssh_host_rsa_key|' \
-       -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$|HostKey /etc/ssh/ssh_host_ecdsa_key|' \
-       -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$|HostKey /etc/ssh/ssh_host_ed25519_key|' \
+       -e 's|^#\?HostKey /etc/ssh/ssh_host_dsa_key$||' \
+       -e 's|^#\?HostKey /etc/ssh/ssh_host_ecdsa_key$||' \
+       -e 's|^#\?HostKey /etc/ssh/ssh_host_ed25519_key$||' \
+       -e 's|^#\?HostKey /etc/ssh/ssh_host_rsa_key$|HostKey /etc/ssh/ssh_host_ecdsa_key\nHostKey /etc/ssh/ssh_host_ed25519_key\nHostKey /etc/ssh/ssh_host_rsa_key|' \
 
 # Move away old and unsupported keys
 mv -f /etc/ssh/ssh_host_dsa_key{,.old}