From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZypQx3vJjz33xG for ; Thu, 15 May 2025 11:49:29 +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 (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ZypQt0mLVz33d6 for ; Thu, 15 May 2025 11:49:26 +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 RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4ZypQs590sz2r9; Thu, 15 May 2025 11:49:25 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1747309765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g5Qtdz7YSjD1frwZG8fvoHSqvlgylaeKatT5DT4GmAk=; b=ScoHJQIa5vShCsOr3E/rSDACNmfM3WWMU4v42HdWUsW6TcLRi3xJd54UBhsE3Qi3zims8t tuex1/6OBAOpTaBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1747309765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g5Qtdz7YSjD1frwZG8fvoHSqvlgylaeKatT5DT4GmAk=; b=Dj4ZbSt6RwQgGu8jFSN450q9XgJxOMY+nG2j4eUBudUE1lg+7743ng3uCXsgeZRCKyyHBE TwT2oAQnyJ99RuvALJeW2y2mLLMFJyuzEqUPziJxXHO9mFbq52pI1eJCTEqgVp/XJYhj3k 6L4RXdUSu/gp5s1OoJWgjINcS+NMAKV51ipCBOvzUhLBe8hfAe0Xq/wnfA//wjhuSxkOG3 3kufxFCmdbNgIXwrHGYsazJCtBepU2fuKyeC+EJr/p4sKaldgdN8r/cKqoiV+239YV0VfS iQq3J3MEblN/qZ76PUZtPHwSzjhpY4UOmGOGSAMoD5GRJ+IxV5/+zz+d1o/OoA== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH 3/4] red: Fixes rrd file name updates from collectd-5 update Date: Thu, 15 May 2025 13:49:19 +0200 Message-ID: <20250515114920.12919-3-adolf.belka@ipfire.org> In-Reply-To: <20250515114920.12919-1-adolf.belka@ipfire.org> References: <20250515114920.12919-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit - Some additional rrd file name changes missed from collect-5 update. - This was identified as part of fixing bug13834 - Couldn't test this as I don't have a ppp0 connection available but the chnage is inline with the other rrd changes which have been tested as working. Signed-off-by: Adolf Belka --- src/initscripts/networking/red | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red index 2a5f06b4e..fddc70d92 100644 --- a/src/initscripts/networking/red +++ b/src/initscripts/networking/red @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2022 IPFire Team # +# Copyright (C) 2007-2025 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -483,7 +483,7 @@ case "${1}" in /etc/rc.d/init.d/connectd start # Add a NaN value to ppp0 rrd to supress spikes at reconnect - rrdtool update $RRDLOG/collectd/localhost/interface/if_octets-ppp0.rrd \ + rrdtool update $RRDLOG/collectd/localhost/interface-ppp0/if_octets.rrd \ $(date +%s):: > /dev/null 2>&1 exit 0 fi @@ -524,7 +524,7 @@ case "${1}" in killall -w -s TERM /usr/sbin/pppd 2>/dev/null evaluate_retval # Add a NaN value to ppp0 rrd to supress spikes at reconnect - rrdtool update $RRDLOG/collectd/localhost/interface/if_octets-ppp0.rrd \ + rrdtool update $RRDLOG/collectd/localhost/interface-ppp0/if_octets.rrd \ $(date +%s):: > /dev/null 2>&1 elif [ "$TYPE" == "DHCP" ]; then -- 2.49.0