From patchwork Sat Mar 5 14:45:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 5316 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4K9nb368rDz3xgY for ; Sat, 5 Mar 2022 14:45:51 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4K9nb01VJmzs6; Sat, 5 Mar 2022 14:45:48 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4K9nb00CzMz2yV0; Sat, 5 Mar 2022 14:45:48 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4K9nZy2J5Qz2xXd for ; Sat, 5 Mar 2022 14:45:46 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4K9nZw6dkgzQl for ; Sat, 5 Mar 2022 14:45:44 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1646491545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZWFpEsTJRgQyGhQJj0DwUCyQhrVsR2z5OneKvS8Bh0M=; b=IeD08aj/JZn619yPj9iDJtFr0dre0GH2DTRZDoGVGY50BjKeI2ZhF3TfZ3rxF/Q4rkPs4p prJhhuCui4nMm0Aw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1646491545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZWFpEsTJRgQyGhQJj0DwUCyQhrVsR2z5OneKvS8Bh0M=; b=kU5V8uvyUWFNQNAM6KteHSVworoSY/km76VkW2ABBqrPuyQTepryhqdFXMkX84scIC6SqT JS0Ghx+TBv9lPyl4aMxtDaaKLDHIphlOZb7qpP0cqwHwg7VMh4QOZzMD+Z+aFTFb1WDbrJ Wl7736dfB6SL+2CbtJsmUYDgVdIx5tmX0lA1TbPOFnCEmGUO4oQLzgCFMOhQ5h8Ckk+I93 aqPrPkTZzHVB4UlomD24NzVPt1OSuKEEGoomKQwSCtuBpq7rDUpLPCUIMw1ltf/5Rfio2L Qzp8U/2SnrYFzxngPeR6r3yj0JPkvnyl2jtUofPDHigOmhoXYJaIRC3Djy6INQ== Message-ID: Date: Sat, 5 Mar 2022 14:45:32 +0000 MIME-Version: 1.0 Content-Language: en-US To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH v2] Core Update 165: Rename squid-accounting add-on to proxy-accounting X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- 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