Merge remote-tracking branch 'origin/core120' into kernel-4.14

[ipfire-2.x.git] / config / rootfiles / core / 120 / update.sh

diff --git a/config/rootfiles/core/120/update.sh b/config/rootfiles/core/120/update.sh
index 2f1bca02cbb023de75d0d3047707bd70b315bd25..459262c86e0edf25c60ae5a5f4db7ad5604ec6f0 100644 (file)
--- a/config/rootfiles/core/120/update.sh
+++ b/config/rootfiles/core/120/update.sh
@@ -34,6 +34,11 @@ done
 # Remove forgotten PHP file
 rm -f /etc/httpd/conf/conf.d/php5.conf
 
+# Delete old PAM libs and symlinks if presant
+if ls /lib | grep -q 'libpam.*'; then
+    rm -f /lib/libpam*
+fi
+
 # Stop services
 
 # Extract files
@@ -64,12 +69,13 @@ fi
 
 # Start services
 /etc/init.d/apache restart
+/etc/init.d/unbound restart
 
 # Remove deprecated SSH configuration option
 sed -e "/UsePrivilegeSeparation/d" -i /etc/ssh/sshd_config
 
 # Import new Pakfire key
-gpg --import /opt/pakfire/pakfire.key
+/etc/init.d/pakfire start
 
 # This update needs a reboot...
 touch /var/run/need_reboot