collectd: Ignore *phys, macvtap* and vnet* interfaces

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 384c9436009a48546fb031a4bac8e6641161edb6..486077a9e69e88c508d12f0893e01567d53a6544 100644 (file)
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -34,9 +34,9 @@ include "/etc/collectd.precache"
 
 <Plugin interface>
        Interface "lo"
-       Interface "ipsec1"
-       Interface "ipsec2"
-       Interface "ipsec3"
+       Interface "/[0-9]*phys$/"
+       Interface "/^macvtap[0-9]*$/"
+       Interface "/^vnet[0-9]*$/"
        IgnoreSelected true
 </Plugin>
 

diff --git a/config/rootfiles/core/104/filelists/files b/config/rootfiles/core/104/filelists/files
index 13e547a99920531521640da65ba33b7ff13d5018..6679071b23f8d0639e77121fd66df20fc619ef91 100644 (file)
--- a/config/rootfiles/core/104/filelists/files
+++ b/config/rootfiles/core/104/filelists/files
@@ -1,4 +1,5 @@
 etc/system-release
 etc/issue
+etc/collectd.conf
 opt/pakfire/lib/functions.sh
 srv/web/ipfire/cgi-bin/ids.cgi

diff --git a/config/rootfiles/core/104/update.sh b/config/rootfiles/core/104/update.sh
index 615e7975e56eeff84504c450c45e9feb2b829214..53ca6f78c8de9946e82c134c52ccbc2cba757588 100644 (file)
--- a/config/rootfiles/core/104/update.sh
+++ b/config/rootfiles/core/104/update.sh
@@ -41,6 +41,7 @@ do
 done
 
 # Stop services
+/etc/init.d/collectd stop
 
 # Extract files
 extract_files
@@ -55,6 +56,7 @@ ldconfig
 #/usr/local/bin/update-lang-cache
 
 # Start services
+/etc/init.d/collectd start
 /etc/init.d/snort restart
 
 # This update need a reboot...