core184: Ship squid

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/184/filelists/squid b/config/rootfiles/core/184/filelists/squid
new file mode 120000 (symlink)
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/core/184/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file

diff --git a/config/rootfiles/core/184/update.sh b/config/rootfiles/core/184/update.sh
index d744b51191e32b1a021917f7dae1e4875b8c1326..c3593414e5f8857994bcbb3054bfdae4fbae6265 100644 (file)
--- a/config/rootfiles/core/184/update.sh
+++ b/config/rootfiles/core/184/update.sh
@@ -32,6 +32,7 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Stop services
+/etc/init.d/squid stop
 /etc/init.d/vnstat stop
 
 # Extract files
@@ -80,6 +81,10 @@ telinit u
 /etc/init.d/vnstat start
 /etc/init.d/collectd restart
 
+if [ -f /var/ipfire/proxy/enable ]; then
+       /etc/init.d/squid start
+fi
+
 # This update needs a reboot...
 touch /var/run/need_reboot