From patchwork Thu Apr 7 15:43:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Fischer X-Patchwork-Id: 5465 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4KZ5JG3KBmz3x1b for ; Thu, 7 Apr 2022 15:43:26 +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 4KZ5JF3rVBz4St; Thu, 7 Apr 2022 15:43:25 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KZ5JF3YGcz2xqt; Thu, 7 Apr 2022 15:43:25 +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 4KZ5JC5g0vz2xbM for ; Thu, 7 Apr 2022 15:43:23 +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 4KZ5JC1JkhzWn for ; Thu, 7 Apr 2022 15:43:23 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1649346203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=rl45Rpv5YsThMrPB+Q5lKcQ+tdSte3rSNu7Gw2ztWEk=; b=YU/Nd7eF8LRHN9wlQ7Dy3zeFrAs1LxjDKCHCA3iHmtjm6E9SkxErMRIRl7xIY6fAHzrxID UYey/DM7/AYGUKBQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1649346203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=rl45Rpv5YsThMrPB+Q5lKcQ+tdSte3rSNu7Gw2ztWEk=; b=XjgJQbbKbD2OrfCqVmopy0SImdPkbY8R9E6JfinJbQMEAHsIzxbYHo11BT+F61T9U90P66 wZd7h3MZPZXHyqKtm9VL6ADhXMhL4GbFeAdTdvGtBDXk1JQaQ58BpFL4yfDG0mPOPGL9jq OJnFMC8mtJ9OBqwSw+O+4/UoAC+wyZ7WDOTD8GGrfJJAz5oXc9ocRXNJAzYXA2cv8JLFcJ VnMR/5sypaqmlQoB6V2S778srKFMWfKrqK1RBxRFfpCwvXDRreO/Z0ARAFGfICqQXC1DvP +ucdfmQTD4htEmqAefaKQ+YMko6UL1sMVrJqo6/d/qOoxhdUxeMX+E/J2Hui1A== From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] Deleted 'vnstat' calls in initscripts - those options were removed and we're using 'vnstatd', not 'vnstat'. Date: Thu, 7 Apr 2022 17:43:18 +0200 Message-Id: <20220407154318.1803-1-matthias.fischer@ipfire.org> MIME-Version: 1.0 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" Fixes: #12831 Signed-off-by: Matthias Fischer --- src/initscripts/networking/any | 5 ----- src/initscripts/networking/red | 14 +------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/initscripts/networking/any b/src/initscripts/networking/any index 0facf23d8..15197badb 100644 --- a/src/initscripts/networking/any +++ b/src/initscripts/networking/any @@ -83,9 +83,6 @@ case "${1}" in fi fi - # Create & Enable vnstat data collection - /usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1 - if [ ! "${ADDRESS}" == "1.1.1.1" ]; then boot_mesg "Adding IPv4 address ${ADDRESS} to the ${DEVICE} interface..." ip addr add ${args} dev ${DEVICE} @@ -100,8 +97,6 @@ case "${1}" in evaluate_retval fi - # Disable vnstat collection - /usr/bin/vnstat -u -i ${DEVICE} -r --disable > /dev/null 2>&1 exit 0; ;; esac diff --git a/src/initscripts/networking/red b/src/initscripts/networking/red index 38129deeb..fc10e077a 100644 --- a/src/initscripts/networking/red +++ b/src/initscripts/networking/red @@ -103,9 +103,6 @@ case "${1}" in fi fi - ## Create & Enable vnstat - /usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1 - if [ "${TYPE}" == "STATIC" ]; then # Set the MTU if [ -n "${MTU}" ]; then @@ -176,9 +173,6 @@ case "${1}" in dhcpcd_start "${DEVICE}" fi - ## Create & Enable vnstat - /usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1 - elif [ "$TYPE" == "PPPOE" ]; then if ( ps ax | grep -q [p]ppd ); then @@ -459,8 +453,7 @@ case "${1}" in evaluate_retval # echo PPP: /usr/sbin/pppd pty "$PPPOE_CMD" $PPP_STD_OPTIONS $DEBUG $DEMAND $PPPD_SYNC fi - ## Create & Enable vnstat - /usr/bin/vnstat -u -i ppp0 -r --enable --force > /dev/null 2>&1 + /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 \ @@ -485,8 +478,6 @@ case "${1}" in elif [ "$TYPE" == "PPPOE" ]; then boot_mesg "Bringing down the PPP interface ..." - ## Disable vnstat collection - /usr/bin/vnstat -u -i ppp0 -r --disable > /dev/null 2>&1 rm -f /var/ipfire/red/keepconnected killall -w -s TERM /usr/sbin/pppd 2>/dev/null evaluate_retval @@ -533,9 +524,6 @@ case "${1}" in killall -w -s KILL pptp >/dev/null 2>&1 killall -w -s KILL br2684ctl >/dev/null 2>&1 - ## Disable vnstat collection - /usr/bin/vnstat -u -i ${DEVICE} -r --disable > /dev/null 2>&1 - exit 0; ;; esac