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

diff --combined config/rootfiles/oldcore/94/update.sh
index 6560662e3205d8c36f65e1f2af335519a5c999ce,a9c24a5f8344b712cbe35950cae6ea3bd90ab706..a9c24a5f8344b712cbe35950cae6ea3bd90ab706
--- 1/config/rootfiles/oldcore/94/update.sh
--- 2/config/rootfiles/core/94/update.sh
+++ b/config/rootfiles/oldcore/94/update.sh
@@@ -47,7 -47,10 +47,10 @@@ telinit 
  
  # 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_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|' \
  
  # Move away old and unsupported keys
  mv -f /etc/ssh/ssh_host_dsa_key{,.old}
@@@ -70,6 -73,17 +73,17 @@@ EO
  
  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