From mboxrd@z Thu Jan  1 00:00:00 1970
From: Peter =?utf-8?q?M=C3=BCller?= <peter.mueller@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH v2] Core Update 165: Rename squid-accounting add-on to
 proxy-accounting
Date: Sat, 05 Mar 2022 14:45:32 +0000
Message-ID: <cbfdd374-aa6d-7534-49cb-fa2c9d83ae6d@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6340080643932281864=="
List-Id: <development.lists.ipfire.org>

--===============6340080643932281864==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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(a)ipfire.org>
Cc: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
---
 config/rootfiles/core/165/update.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/config/rootfiles/core/165/update.sh b/config/rootfiles/core/165/=
update.sh
index fe4449fff..f505628e4 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
=20
+# 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/pa=
kfire/db/meta/meta-squid-accounting" ]; then
+	mv -v /opt/pakfire/db/installed/meta-squid-accounting /opt/pakfire/db/insta=
lled/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
=20
 # Extract files
--=20
2.34.1

--===============6340080643932281864==--