From 6137dbbab25a0b3688f98282568f15fa7eb730fa Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Thu, 18 Apr 2013 09:24:42 +0200
Subject: [PATCH] Disable the manual net.if.discovery key as it conflicts with
 the builtin one

---
 zabbix_conf/net_interface.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zabbix_conf/net_interface.conf b/zabbix_conf/net_interface.conf
index 5b6752b..d6b2bd1 100644
--- a/zabbix_conf/net_interface.conf
+++ b/zabbix_conf/net_interface.conf
@@ -1,2 +1,2 @@
 # Can replace the builtin net.if.discovery on agent < 2.0.0
-UserParameter=net.if.discovery,/var/lib/zabbix/bin/disco_net_interface
+#UserParameter=net.if.discovery,/var/lib/zabbix/bin/disco_net_interface