[patch] revised plugin cleanup patch

munin-1.4.3-plugin-cleanup.patch (text/plain), 953 bytes, created by Brian De Wolf on 2010-01-08 23:44:28 UTC

--- munin-1.4.3/plugins/node.d.linux/iostat_ios.in.bak	2008-04-13 15:29:37.000000000 +0100
+++ munin-1.4.3/plugins/node.d.linux/iostat_ios.in	2008-04-13 15:30:59.000000000 +0100
@@ -59,12 +59,16 @@
 
 sub filter {
     my ($major, $minor, $tmpnam) = @_;
-    return 0 if ($major ==   1); # RAM devices
-    return 0 if ($major ==   9); # MD devices
-    return 0 if ($major ==  58); # LVM devices
-    return 0 if ($major == 254); # LVM2 devices
-    return 0 if ($tmpnam =~ /part\d+$/);
-    return 0 if ($tmpnam =~ /^\s*(?:sd|hd)[a-z]\d+\s*$/);
+    if(defined($major)) {
+        return 0 if ($major ==   1); # RAM devices
+        return 0 if ($major ==   9); # MD devices
+        return 0 if ($major ==  58); # LVM devices
+        return 0 if ($major == 254); # LVM2 devices
+    }
+    if(defined($tmpnam)) {
+        return 0 if ($tmpnam =~ /part\d+$/);
+        return 0 if ($tmpnam =~ /^\s*(?:sd|hd)[a-z]\d+\s*$/);
+    }
 
     return 1;
 }