Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / config / rootfiles / oldcore / 157 / update.sh

diff --git a/config/rootfiles/oldcore/157/update.sh b/config/rootfiles/oldcore/157/update.sh
index ce7b6f5bf647aec402b6cbe37a8cfb0b790dab7d..94b10723ff65cb260d35e2835163618ccadfd597 100644 (file)
--- a/config/rootfiles/oldcore/157/update.sh
+++ b/config/rootfiles/oldcore/157/update.sh
@@ -97,6 +97,9 @@ extract_files
 # update linker config
 ldconfig
 
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
 # Update Language cache
 /usr/local/bin/update-lang-cache
 
@@ -121,6 +124,10 @@ rm -f \
        /usr/lib/dma-mbox-create \
        /usr/lib/openssh/ssh-keysign
 
+# Delete orphaned pppd 2.4.8 shared object files
+rm -rf \
+       /usr/lib/pppd/2.4.8/
+
 # Start services
 /etc/init.d/sshd restart
 /etc/init.d/apache restart