vnstat: remove wrong tag file

fixes #12305

I had created this tag file to ship the folder but vnstat doesn't like empty files.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 9a92a9d9f72645371c46e49eecdb4823eddeaafa..e08d8de84c996a9b29406b1e3bf11a104922cbff 100644 (file)
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -76,6 +76,9 @@ restore_backup() {
        /bin/kill -HUP `cat /var/run/suricata.pid 2> /dev/null` 2> /dev/null
        /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null
 
+       # remove wrong vnstat tag file
+       rm -f /var/log/vnstat/tag
+
        # Run converters
 
        # Outgoing Firewall

diff --git a/config/rootfiles/common/vnstat b/config/rootfiles/common/vnstat
index d5b56a6792b2d43dd4b1c5a493b76d6aa26171ff..42e00ed2ad3cee4b4dfe9822d99ea67852e5773e 100644 (file)
--- a/config/rootfiles/common/vnstat
+++ b/config/rootfiles/common/vnstat
@@ -9,5 +9,4 @@ usr/bin/vnstati
 #usr/share/man/man1/vnstati.1
 #usr/share/man/man1/vnstat.1
 #var/lib/vnstat
-#var/log/vnstat
-var/log/vnstat/tag
+var/log/vnstat

diff --git a/config/rootfiles/core/143/update.sh b/config/rootfiles/core/143/update.sh
index 092b9c399a5d722673a98ca7bfb252dfaf1af2fe..90d3f72fcd6e6d4cc1df1a879d8c25628ff3e6d6 100644 (file)
--- a/config/rootfiles/core/143/update.sh
+++ b/config/rootfiles/core/143/update.sh
@@ -59,6 +59,9 @@ extract_files
 # update linker config
 ldconfig
 
+# remove wrong vnstat tag file
+rm -f /var/log/vnstat/tag
+
 # restart init after glibc replace
 telinit u
 

diff --git a/lfs/vnstat b/lfs/vnstat
index b1a17ce1f02dddba453e6b0ee6147932bb5ecdb0..27189126b1ab4dfd3b0146e14c410aad0dd0d09a 100644 (file)
--- a/lfs/vnstat
+++ b/lfs/vnstat
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  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        #
@@ -87,7 +87,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        sed -i 's|/var/run/vnstat/vnstat.pid|/var/run/vnstat.pid|g' /etc/vnstat.conf
 
        mkdir -p /var/log/vnstat
-       touch /var/log/vnstat/tag
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)