From 1de76192c582211640118a2a32bd5b7581e1c537 Mon Sep 17 00:00:00 2001 From: crcro Date: Sat, 20 Aug 2016 01:42:49 +0300 Subject: [PATCH] Revert "added to arubaos" This reverts commit 29d5b8a5af8710cef31c427c4972f4da0ba5eb8c. --- includes/discovery/os/arubaos.inc.php | 3 --- includes/discovery/os/procurve.inc.php | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/discovery/os/arubaos.inc.php b/includes/discovery/os/arubaos.inc.php index 2ce0bc11b8..7364e5d194 100644 --- a/includes/discovery/os/arubaos.inc.php +++ b/includes/discovery/os/arubaos.inc.php @@ -3,8 +3,5 @@ if (!$os) { if (strstr($sysDescr, 'ArubaOS')) { $os = 'arubaos'; - } elseif (preg_match('/HP(.+)2530(.+)/', $sysDescr)) { - //hp aruba 2530 series - $os = 'procurve'; } } diff --git a/includes/discovery/os/procurve.inc.php b/includes/discovery/os/procurve.inc.php index d5a7377b86..f426670f29 100644 --- a/includes/discovery/os/procurve.inc.php +++ b/includes/discovery/os/procurve.inc.php @@ -6,5 +6,8 @@ if (!$os) { } else if (preg_match('/eCos-[0-9.]+/', $sysDescr)) { $os = 'procurve'; + } elseif (preg_match('/HP(.+)2530(.+)/', $sysDescr)) { + //hp aruba 2530 series + $os = 'procurve'; } }