* [PATCH] Deleted 'vnstat' calls in initscripts - those options were removed and we're using 'vnstatd', not 'vnstat'.
@ 2022-04-07 16:46 Matthias Fischer
0 siblings, 0 replies; 4+ messages in thread
From: Matthias Fischer @ 2022-04-07 16:46 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3835 bytes --]
Fixes: 12831
Jonatan Schlag reported that the command line options of 'vnstat' had changed
"...and seemed to be broken a long time".
=> https://bugzilla.ipfire.org/show_bug.cgi?id=12831#c0
Several command line switches used in networking initscripts were obviously removed.
Affected commands in '.../networking/any' and '.../networking/red'):
...
/usr/bin/vnstat -u -i ${DEVICE} -r --enable --force > /dev/null 2>&1
...
/usr/bin/vnstat -u -i ${DEVICE} -r --disable > /dev/null 2>&1
...
and
...
/usr/bin/vnstat -u -i ppp0 -r --disable > /dev/null 2>&1
...
Adolf Belka tested this, "looked through the changelogs" and found - besides that
the switch '--enable' had been removed "in version 2.0 in 2018" - that '--enable', '--update'
and '--reset' switches are either not needed or not supported anymore.
"The old man page indicates that none of those options are used when the vnstat daemon
is running."
Since we only start and run 'vnstatd' in IPFire it was decided to remove these commands.
Reported-by: jonatan.schlag <jonatan.schlag(a)ipfire.org>
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
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(-)
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
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Deleted 'vnstat' calls in initscripts - those options were removed and we're using 'vnstatd', not 'vnstat'.
2022-04-07 15:53 ` Michael Tremer
@ 2022-04-07 16:50 ` Matthias Fischer
0 siblings, 0 replies; 4+ messages in thread
From: Matthias Fischer @ 2022-04-07 16:50 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3257 bytes --]
On 07.04.2022 17:53, Michael Tremer wrote:
> Hello Matthias,
Hi,
> Thanks for this patch.
>
> Could you please elaborate a little bit more about why those commands are not needed any more?
Done. ;-)
> -Michael
>
>> On 7 Apr 2022, at 16:43, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote:
>>
>> Fixes: #12831
>>
>> 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(-)
>>
>> 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
>> --
>> 2.25.1
>>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Deleted 'vnstat' calls in initscripts - those options were removed and we're using 'vnstatd', not 'vnstat'.
2022-04-07 15:43 Matthias Fischer
@ 2022-04-07 15:53 ` Michael Tremer
2022-04-07 16:50 ` Matthias Fischer
0 siblings, 1 reply; 4+ messages in thread
From: Michael Tremer @ 2022-04-07 15:53 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3088 bytes --]
Hello Matthias,
Thanks for this patch.
Could you please elaborate a little bit more about why those commands are not needed any more?
-Michael
> On 7 Apr 2022, at 16:43, Matthias Fischer <matthias.fischer(a)ipfire.org> wrote:
>
> Fixes: #12831
>
> 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(-)
>
> 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
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] Deleted 'vnstat' calls in initscripts - those options were removed and we're using 'vnstatd', not 'vnstat'.
@ 2022-04-07 15:43 Matthias Fischer
2022-04-07 15:53 ` Michael Tremer
0 siblings, 1 reply; 4+ messages in thread
From: Matthias Fischer @ 2022-04-07 15:43 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2714 bytes --]
Fixes: #12831
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(-)
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
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-04-07 16:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-07 16:46 [PATCH] Deleted 'vnstat' calls in initscripts - those options were removed and we're using 'vnstatd', not 'vnstat' Matthias Fischer
-- strict thread matches above, loose matches on Subject: below --
2022-04-07 15:43 Matthias Fischer
2022-04-07 15:53 ` Michael Tremer
2022-04-07 16:50 ` Matthias Fischer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox