[patch] revised patch from 1.3.4

munin-1.4.3-fw_conntrack_plugins.patch (text/plain), 724 bytes, created by Brian De Wolf on 2010-01-08 23:43:11 UTC

--- plugins/node.d.linux/fw_forwarded_local.in.bak	2010-01-08 11:23:26.000000000 -0800
+++ plugins/node.d.linux/fw_forwarded_local.in	2010-01-08 11:24:24.000000000 -0800
@@ -32,7 +32,7 @@
 =cut
 
 if [ "$1" = "autoconf" ]; then
-	if [ -r /proc/net/ip_conntrack ]
+	if [ -r /proc/net/ip_conntrack -o -r /proc/net/nf_conntrack ]
 	then
 		echo yes
 	else
@@ -53,6 +53,13 @@
 	exit 0
 fi
 
+if [ -r /proc/net/ip_conntrack ]; then
+	_conntrack_file=/proc/net/ip_conntrack
+else
+	_conntrack_file=/proc/net/nf_conntrack
+fi
+
+
 perl -ne '
     BEGIN { $forward=0; $local=0; }
 
@@ -65,5 +72,5 @@
        }
     }
     END { print "forward.value $forward\nlocal.value $local\n" }
-' </proc/net/ip_conntrack
+' <_conntrack_file