From: Peter Müller <peter.mueller@ipfire.org>
Date: Sat, 4 Mar 2023 13:40:45 +0000 (+0000)
Subject: Core Update 174: Ship and restart Squid
X-Git-Tag: v2.27-core174~131
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb7fed2a6dae7465475497ae8d212b8f07a3d38e;p=ipfire-2.x.git

Core Update 174: Ship and restart Squid

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---

diff --git a/config/rootfiles/core/174/filelists/squid b/config/rootfiles/core/174/filelists/squid
new file mode 120000
index 0000000000..2dc8372a0e
--- /dev/null
+++ b/config/rootfiles/core/174/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/174/update.sh b/config/rootfiles/core/174/update.sh
index 614e914f4f..49280a89ad 100644
--- a/config/rootfiles/core/174/update.sh
+++ b/config/rootfiles/core/174/update.sh
@@ -17,7 +17,7 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2022 IPFire-Team <info@ipfire.org>.                        #
+# Copyright (C) 2023 IPFire-Team <info@ipfire.org>.                        #
 #                                                                          #
 ############################################################################
 #
@@ -32,6 +32,7 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Stop services
+/etc/rc.d/init.d/squid stop
 
 # Extract files
 extract_files
@@ -51,6 +52,9 @@ ldconfig
 
 # Start services
 telinit u
+if [ -f /var/ipfire/proxy/enable ]; then
+	/etc/init.d/squid start
+fi
 
 # This update needs a reboot...
 touch /var/run/need_reboot