From ac640d456c5d726bdcad4913331be2ee9d1e7a8e Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Fri, 6 May 2011 17:43:15 +0000
Subject: [PATCH] fix ignore mount regexp

git-svn-id: http://www.observium.org/svn/observer/trunk@2265 61d68cd4-352d-0410-923a-c4978735b2b8
---
 html/pages/device/overview.inc.php |  1 +
 includes/defaults.inc.php          | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/html/pages/device/overview.inc.php b/html/pages/device/overview.inc.php
index 41f7b3c0c..a07f31f17 100644
--- a/html/pages/device/overview.inc.php
+++ b/html/pages/device/overview.inc.php
@@ -26,6 +26,7 @@ echo("<div style='width: 50%; float: left;'>");
 #}
 
 include("overview/ports.inc.php");
+include("overview/current.inc.php");
 
 if ($services['total'])
 {
diff --git a/includes/defaults.inc.php b/includes/defaults.inc.php
index 0407d6fe8..6c19efe2d 100644
--- a/includes/defaults.inc.php
+++ b/includes/defaults.inc.php
@@ -263,16 +263,16 @@ $config['ignore_mount_string'][] = "procfs";
 $config['ignore_mount_string'][] = "UMA";
 $config['ignore_mount_string'][] = "MALLOC";
 
-$config['ignore_mount_regexp'] = "/on: \/packages/";
-$config['ignore_mount_regexp'] = "/on: \/dev/";
-$config['ignore_mount_regexp'] = "/on: \/proc/";
-$config['ignore_mount_regexp'] = "/on: \/junos^/";
-$config['ignore_mount_regexp'] = "/on: \/junos\/dev/";
-$config['ignore_mount_regexp'] = "/on: \/jail\/dev/";
-$config['ignore_mount_regexp'] = "/^(dev|proc)fs/";
-$config['ignore_mount_regexp'] = "/^\/dev\/md0/";
-$config['ignore_mount_regexp'] = "/^\/var\/dhcpd\/dev,/";
-$config['ignore_mount_regexp'] = "/UMA/";
+$config['ignore_mount_regexp'][] = "/on: \/packages/";
+$config['ignore_mount_regexp'][] = "/on: \/dev/";
+$config['ignore_mount_regexp'][] = "/on: \/proc/";
+$config['ignore_mount_regexp'][] = "/on: \/junos^/";
+$config['ignore_mount_regexp'][] = "/on: \/junos\/dev/";
+$config['ignore_mount_regexp'][] = "/on: \/jail\/dev/";
+$config['ignore_mount_regexp'][] = "/^(dev|proc)fs/";
+$config['ignore_mount_regexp'][] = "/^\/dev\/md0/";
+$config['ignore_mount_regexp'][] = "/^\/var\/dhcpd\/dev,/";
+$config['ignore_mount_regexp'][] = "/UMA/";
 
 $config['ignore_mount_removable'] = 1; # Ignore removable disk storage
 $config['ignore_mount_network']   = 1; # Ignore network mounted storage