Re: [PATCH v2] Core Update 165: Rename squid-accounting add-on to proxy-accounting

[Adolf Belka <adolf.belka@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 2455 bytes --]

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 from 164 to 165 Testing with squid-accounting installed as an addon in the CU164 version.


The files needing changing are:-

/var/ipfire/backup/includes/squid-accounting to /var/ipfire/backup/includes/proxy-accounting

/var/ipfire/backup/includes/squid-accounting.ipf to /var/ipfire/backup/includes/proxy-accounting.ipf

Regards,

Adolf.

On 05/03/2022 21:40, Adolf Belka wrote:
> Hi Peter,
>
> On 05/03/2022 15:45, Peter Müller 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 need 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 needed for any of them.
>
> Regards,
> Adolf.
>> Cc: Michael Tremer <michael.tremer(a)ipfire.org>
>> Cc: Adolf Belka <adolf.belka(a)ipfire.org>
>> Signed-off-by: Peter Müller <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
>>   +# 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
>