From cc97d7b417a44749be1568478173b799a7dc5ff9 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 13 Jul 2016 16:55:29 +0100
Subject: [PATCH] collectd: Ignore *phys, macvtap* and vnet* interfaces

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 config/collectd/collectd.conf             | 6 +++---
 config/rootfiles/core/104/filelists/files | 1 +
 config/rootfiles/core/104/update.sh       | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 384c94360..486077a9e 100644
--- 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 13e547a99..6679071b2 100644
--- 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 615e7975e..53ca6f78c 100644
--- 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...