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

Fix devices page search & OS loading (#9752)

Browse Source 
* Fix devices page search

* add a definition_loaded flag to prevent false positives for already loaded OS

* Fix copy paste error

* and another
This commit is contained in:
Tony Murray
2019-01-28 10:37:41 -06:00
committed by GitHub
parent 61f7046b60
commit eb59287d34
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
includes/common.php
View File

@@ -1535,7 +1535,12 @@ function load_os(&$device)
global $config;
if (!isset($device['os'])) {
d_echo('No OS to load');
d_echo("No OS to load\n");
return;
}
if (isset($config['os'][$device['os']]['definition_loaded'])) {
d_echo("OS already loaded\n");
return;
}
@@ -1562,6 +1567,8 @@ function load_os(&$device)
} else {
unset($device['os_group']);
}
$config['os'][$device['os']]['definition_loaded'] = true;
}
/**