]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - config/rootfiles/core/92/update.sh
Merge branch 'master' into next
[ipfire-2.x.git] / config / rootfiles / core / 92 / update.sh
index b8ebe95f62f6ad9689e35f696b2bf729e676351c..083561fc19adee6fb6b715e12b7fd314747151d1 100644 (file)
@@ -32,6 +32,7 @@ do
 done
 
 # Stop services
+/etc/init.d/squid stop
 /etc/init.d/ipsec stop
 
 # Extract files
@@ -44,12 +45,12 @@ extract_files
 sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
 
 rm -f /bin/[
-sync
 
 # Start services
 if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
        /etc/init.d/ipsec start
 fi
+/etc/init.d/squid start
 
 # This update need a reboot...
 touch /var/run/need_reboot
@@ -61,6 +62,7 @@ sendprofile
 if [ -e /boot/grub/grub.cfg ]; then
        grub-mkconfig > /boot/grub/grub.cfg
 fi
+sync
 
 # Don't report the exitcode last command
 exit 0