Hi,
this would have been better split into two patches so that one thing can be merged without the other.
I will take it both together for now.
Best, -Michael
P.S. I did not appreciate that comment of that forum user about this bug. Bugs happen. If he doesn't like it, he can take lots of €€€€ into his hand and pay other people to get their bugs.
On Tue, 2018-03-20 at 20:46 +0100, Matthias Fischer wrote:
For details see: https://humdi.net/vnstat/CHANGES
Changed "SaveInterval 5" to "SaveInterval 1" in '/etc/vnstat.conf', triggered by https://forum.ipfire.org/viewtopic.php?f=22&t=20448 to avoid data loss with 1Gbit connections and high traffic.
Thanks to BeBiMa for the man page link (https://humdi.net/vnstat/man/vnstatd.h tml). ;-)
Best, Matthias
Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org
lfs/vnstat | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/lfs/vnstat b/lfs/vnstat index 376a1e999..a61bc5ed2 100644 --- a/lfs/vnstat +++ b/lfs/vnstat @@ -1,7 +1,7 @@ ############################################################################# ## # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2017 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # # # # 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 # @@ -24,7 +24,7 @@
include Config
-VER = 1.17 +VER = 1.18
THISAPP = vnstat-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 8de1c7e40806509943804bb4b26f5409 +$(DL_FILE)_MD5 = c9abaeb0ce758c16f6cdfa247bd8606c
install : $(TARGET)
@@ -81,6 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && make all $(MAKETUNING) LOCAL_CONFIGUR E_OPTIONS="--enable-readline=yes" cd $(DIR_APP) && make install sed -i 's|eth0|green0|g' /etc/vnstat.conf
- sed -i 's|SaveInterval 5|SaveInterval 1|g' /etc/vnstat.conf sed -i 's|/var/lib/vnstat|/var/log/vnstat|g' /etc/vnstat.conf sed -i 's|/var/log/vnstat/vnstat.log|/var/log/vnstat.log|g'
/etc/vnstat.conf sed -i 's|/var/run/vnstat/vnstat.pid|/var/run/vnstat.pid|g' /etc/vnstat.conf