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 ff9797c11be72ea67e40f2e07047b4fd44da72ae..99aa04659c11526998f689c0322056ff55bf05e9 100644 (file)
--- a/config/rootfiles/oldcore/94/update.sh
+++ b/config/rootfiles/oldcore/94/update.sh
@@ -39,12 +39,19 @@ done
 # Extract files
 extract_files
 
+# Restart init after glibc update
+telinit u
+
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
 # Update SSH configuration
 sed -i /etc/ssh/sshd_config \
-       -e 's/^#PermitRootLogin yes$/PermitRootLogin yes/'
+       -e 's/^#PermitRootLogin yes$/PermitRootLogin yes/' \
+       -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}
@@ -67,6 +74,17 @@ EOF
 
 fcrontab -z &>/dev/null
 
+# DMA - reconfigure Postfix if exists
+if [ -e /etc/postfix/main.cf ] && [ ! -e "/usr/sbin/sendmail.postfix" ]; then
+       mv /usr/sbin/sendmail /usr/sbin/sendmail.postfix
+       /usr/sbin/alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/sendmail.postfix 15
+       sed -i 's/usr\/sbin\/sendmail/usr/sbin/sendmail.postfix/' /opt/pakfire/db/rootfiles/postfix
+fi
+# DMA - configure dma as default mta
+mkdir -p /etc/alternatives
+mkdir -p /var/lib/alternatives
+/usr/sbin/alternatives --install /usr/sbin/sendmail sendmail /usr/sbin/sendmail.dma 20
+
 # Start services
 /etc/init.d/dnsmasq start
 /etc/init.d/sshd start