From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 9 Feb 2024 11:26:55 +0000 (+0000)
Subject: core184: Ship squid
X-Git-Tag: v2.29-core184~12^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e111d6f03f4e8f71bedd21e623700534ae7603b;p=ipfire-2.x.git

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
index 0000000000..2dc8372a0e
--- /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 d744b51191..c3593414e5 100644
--- 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