Core Update 165: Rename squid-accounting add-on to proxy-accounting

https://lists.ipfire.org/pipermail/development/2022-February/012482.html

The second version of this patch omits bogus directives for restarting a
service, which proxy-accounting is not.

Cc: Michael Tremer <michael.tremer@ipfire.org>
Cc: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/165/update.sh b/config/rootfiles/core/165/update.sh
index fe4449fffcf1874c37488528370645ba085f5170..f505628e4d655a64fdf71ead22995c0f244ac293 100644 (file)
--- a/config/rootfiles/core/165/update.sh
+++ b/config/rootfiles/core/165/update.sh
@@ -97,6 +97,14 @@ rm -rvf \
        /var/ipfire/dhcpc/dhcpcd-hooks/10-mtu \
        /var/ipfire/firewall/p2protocols
 
+# Rename squid-accounting add-on to proxy-accounting, if installed
+# (see: https://lists.ipfire.org/pipermail/development/2022-February/012482.html)
+if [ -e "/opt/pakfire/db/installed/meta-squid-accounting" ] && [ -e "/opt/pakfire/db/meta/meta-squid-accounting" ]; then
+       mv -v /opt/pakfire/db/installed/meta-squid-accounting /opt/pakfire/db/installed/meta-proxy-accounting
+       mv -v /opt/pakfire/db/meta/meta-squid-accounting /opt/pakfire/db/meta/meta-proxy-accounting
+       mv -v /opt/pakfire/db/rootfiles/squid-accounting /opt/pakfire/db/rootfiles/proxy-accounting
+fi
+
 # Stop services
 
 # Extract files