From mboxrd@z Thu Jan  1 00:00:00 1970
From: Matthias Fischer <matthias.fischer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] Deleted 'vnstat' calls in initscripts - those options
 were removed and we're using 'vnstatd', not 'vnstat'.
Date: Thu, 07 Apr 2022 18:50:17 +0200
Message-ID: <c31766af-dfa8-5929-4f6b-3081de364ce5@ipfire.org>
In-Reply-To: <EB20208A-F17D-4CCE-8F47-C556954FC28B@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3256795327554054114=="
List-Id: <development.lists.ipfire.org>

--===============3256795327554054114==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

On 07.04.2022 17:53, Michael Tremer wrote:
> Hello Matthias,

Hi,

> Thanks for this patch.
>=20
> Could you please elaborate a little bit more about why those commands are n=
ot needed any more?

Done. ;-)

> -Michael
>=20
>> On 7 Apr 2022, at 16:43, Matthias Fischer <matthias.fischer(a)ipfire.org> =
wrote:
>>=20
>> Fixes: #12831
>>=20
>> Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
>> ---
>> src/initscripts/networking/any |  5 -----
>> src/initscripts/networking/red | 14 +-------------
>> 2 files changed, 1 insertion(+), 18 deletions(-)
>>=20
>> diff --git a/src/initscripts/networking/any b/src/initscripts/networking/a=
ny
>> index 0facf23d8..15197badb 100644
>> --- a/src/initscripts/networking/any
>> +++ b/src/initscripts/networking/any
>> @@ -83,9 +83,6 @@ case "${1}" in
>> 			fi
>> 		fi
>>=20
>> -		# Create & Enable vnstat data collection
>> -		/usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1
>> -
>> 		if [ ! "${ADDRESS}" =3D=3D "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
>>=20
>> -		# 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/r=
ed
>> index 38129deeb..fc10e077a 100644
>> --- a/src/initscripts/networking/red
>> +++ b/src/initscripts/networking/red
>> @@ -103,9 +103,6 @@ case "${1}" in
>> 			fi
>> 		fi
>>=20
>> -		## Create & Enable vnstat
>> -		/usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1
>> -
>> 		if [ "${TYPE}" =3D=3D "STATIC" ]; then
>> 			# Set the MTU
>> 			if [ -n "${MTU}" ]; then
>> @@ -176,9 +173,6 @@ case "${1}" in
>> 				dhcpcd_start "${DEVICE}"
>> 			fi
>>=20
>> -			## Create & Enable vnstat
>> -			/usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1
>> -
>> 		elif [ "$TYPE" =3D=3D "PPPOE" ]; then
>>=20
>> 			if ( ps ax | grep -q [p]ppd ); then=20
>> @@ -459,8 +453,7 @@ case "${1}" in
>> 				evaluate_retval
>> 				# echo PPP: /usr/sbin/pppd pty "$PPPOE_CMD" $PPP_STD_OPTIONS $DEBUG $D=
EMAND $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
>>=20
>> 		elif [ "$TYPE" =3D=3D "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
>>=20
>> -		## Disable vnstat collection
>> -		/usr/bin/vnstat -u -i ${DEVICE} -r --disable > /dev/null 2>&1
>> -
>> 		exit 0;
>> 		;;
>> esac
>> --=20
>> 2.25.1
>>=20
>=20


--===============3256795327554054114==--