From c896c3c06a91e8e6ab4148cb46fe8ceb7c1337a8 Mon Sep 17 00:00:00 2001
From: Tom Laermans <tom@localhost>
Date: Sat, 30 Jan 2010 12:48:32 +0000
Subject: [PATCH] improve junos mountpoint strings

git-svn-id: http://www.observium.org/svn/observer/trunk@748 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/discovery/storage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/discovery/storage.php b/includes/discovery/storage.php
index 1e23ae461..bac38bb50 100755
--- a/includes/discovery/storage.php
+++ b/includes/discovery/storage.php
@@ -22,7 +22,7 @@
     if (isset($config['ignore_mount_removable']) && $config['ignore_mount_removable'] && $fstype == "hrStorageRemovableDisk") { $allow = 0; if ($debug) echo("removable, skipping\n"); }
     if (isset($config['ignore_mount_network']) && $config['ignore_mount_network'] && $fstype == "hrStorageNetworkDisk") { $allow = 0; if ($debug) echo("network, skipping\n"); }
     $descr = str_replace("mounted on: ", "", $descr);
-    $descr = str_replace(": var file system", "", $descr);
+    $descr = preg_replace("/: [A-Za-z0-9_]+ file system, /", ", ", $descr);
 
     if($size > '0' && $allow) {
       if(mysql_result(mysql_query("SELECT count(storage_id) FROM `storage` WHERE hrStorageIndex = '$hrStorageIndex' AND host_id = '".$device['device_id']."'"),0) == '0') {