Merge branch 'master' into next

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

diff --git a/config/rootfiles/core/92/update.sh b/config/rootfiles/core/92/update.sh
index 0314d80c48a9421296b5c86ce57fdbe35275ae79..083561fc19adee6fb6b715e12b7fd314747151d1 100644 (file)
--- a/config/rootfiles/core/92/update.sh
+++ b/config/rootfiles/core/92/update.sh
@@ -32,6 +32,7 @@ do
 done
 
 # Stop services
+/etc/init.d/squid stop
 /etc/init.d/ipsec stop
 
 # Extract files
@@ -43,19 +44,25 @@ extract_files
 # Regenerate IPsec configuration
 sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
 
-sync
+rm -f /bin/[
 
 # 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
+touch /var/run/need_reboot
 
 # Finish
 /etc/init.d/fireinfo start
 sendprofile
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+       grub-mkconfig > /boot/grub/grub.cfg
+fi
+sync
 
 # Don't report the exitcode last command
 exit 0