mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1522 from clinta/drac-armv5-fix

Browse Source 
Drac armv5 fix
This commit is contained in:
Neil Lathwood
2015-07-22 17:39:09 +01:00
parent 65eed5f2a3 735868c202
commit 64ec365ef7
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/discovery/os/linux.inc.php
View File

@@ -1,7 +1,7 @@
<?php <?php
if (!$os) { if (!$os) {
if (preg_match('/^Linux/', $sysDescr)) { if (preg_match('/^Linux/', $sysDescr) && $sysObjectId != '.1.3.6.1.4.1.674.10892.2') {
$os = 'linux'; $os = 'linux';
} }

3
includes/polling/os/unix.inc.php
View File

@@ -17,7 +17,8 @@ if ($device['os'] == "linux" || $device['os'] == "endian") {
else if (strstr($poll_device['sysDescr'], "mips")) { else if (strstr($poll_device['sysDescr'], "mips")) {
$hardware = "Generic MIPS"; $hardware = "Generic MIPS";
} }
else if (strstr($poll_device['sysDescr'], "armv5")) { // Except iDrac6 from being detected as armv5
else if (strstr($poll_device['sysDescr'], "armv5") && $poll_device['sysObjectID'] != '.1.3.6.1.4.1.674.10892.2') {
$hardware = "Generic ARMv5"; $hardware = "Generic ARMv5";
} }
else if (strstr($poll_device['sysDescr'], "armv6")) { else if (strstr($poll_device['sysDescr'], "armv6")) {