From: Peter Müller Date: Sat, 5 Mar 2022 14:45:32 +0000 (+0000) Subject: Core Update 165: Rename squid-accounting add-on to proxy-accounting X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6fe4eb60948f405fda7c06929baffbf3c6be2e85;p=people%2Fstevee%2Fipfire-2.x.git 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 Cc: Adolf Belka Signed-off-by: Peter Müller Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/core/165/update.sh b/config/rootfiles/core/165/update.sh index fe4449fffc..f505628e4d 100644 --- 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