From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka To: development@lists.ipfire.org Subject: Re: [PATCH v2] Core Update 165: Rename squid-accounting add-on to proxy-accounting Date: Fri, 18 Mar 2022 14:46:24 +0100 Message-ID: In-Reply-To: <85126118-096b-441b-fedd-949237266963@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5896394811253256214==" List-Id: --===============5896394811253256214== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hi Peter, I didn't notice at the time, my fault, but two additional files need to have = their names changed with this patch. I just found it out when testing a CU fr= om 164 to 165 Testing with squid-accounting installed as an addon in the CU16= 4 version. The files needing changing are:- /var/ipfire/backup/includes/squid-accounting to /var/ipfire/backup/includes/p= roxy-accounting /var/ipfire/backup/includes/squid-accounting.ipf to /var/ipfire/backup/includ= es/proxy-accounting.ipf Regards, Adolf. On 05/03/2022 21:40, Adolf Belka wrote: > Hi Peter, > > On 05/03/2022 15:45, Peter M=C3=BCller wrote: >> 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. > Thanks very much for figuring this out. I will note this so that when I nee= d to do it in future I know how to approach it. > > Lucky thing is that all of the packages that were in my perl renaming patch= set were all core packages with none being addons so this approach is not ne= eded for any of them. > > Regards, > Adolf. >> Cc: Michael Tremer >> Cc: Adolf Belka >> Signed-off-by: Peter M=C3=BCller >> --- >> =C2=A0 config/rootfiles/core/165/update.sh | 8 ++++++++ >> =C2=A0 1 file changed, 8 insertions(+) >> >> diff --git a/config/rootfiles/core/165/update.sh b/config/rootfiles/core/1= 65/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 \ >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /var/ipfire/dhcpc/dhcpcd-hooks/10-mtu \ >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /var/ipfire/firewall/p2protocols >> =C2=A0 +# Rename squid-accounting add-on to proxy-accounting, if installed >> +# (see: https://lists.ipfire.org/pipermail/development/2022-February/0124= 82.html) >> +if [ -e "/opt/pakfire/db/installed/meta-squid-accounting" ] && [ -e "/opt= /pakfire/db/meta/meta-squid-accounting" ]; then >> +=C2=A0=C2=A0=C2=A0 mv -v /opt/pakfire/db/installed/meta-squid-accounting = /opt/pakfire/db/installed/meta-proxy-accounting >> +=C2=A0=C2=A0=C2=A0 mv -v /opt/pakfire/db/meta/meta-squid-accounting /opt/= pakfire/db/meta/meta-proxy-accounting >> +=C2=A0=C2=A0=C2=A0 mv -v /opt/pakfire/db/rootfiles/squid-accounting /opt/= pakfire/db/rootfiles/proxy-accounting >> +fi >> + >> =C2=A0 # Stop services >> =C2=A0 =C2=A0 # Extract files > --===============5896394811253256214==--