From 5562f26f6979c2d60202eafe32469989c0878f20 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Thu, 26 Mar 2020 17:56:23 +0000 Subject: [PATCH] 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 --- config/backup/backup.pl | 3 +++ config/rootfiles/common/vnstat | 3 +-- config/rootfiles/core/143/update.sh | 3 +++ lfs/vnstat | 3 +-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config/backup/backup.pl b/config/backup/backup.pl index 9a92a9d9f7..e08d8de84c 100644 --- 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 d5b56a6792..42e00ed2ad 100644 --- 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 092b9c399a..90d3f72fcd 100644 --- 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 b1a17ce1f0..27189126b1 100644 --- a/lfs/vnstat +++ b/lfs/vnstat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2020 IPFire Team # # # # 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) -- 2.39.2